[automerger skipped] use __BIONIC__ not __ANDROID__ am: 48f5cbdd1c am: d268367c34 am: 8e8de49046 -s ours

am skip reason: Change-Id Iec8088a51b471a8b10a28c0ac8c4badf60bbbe5f with SHA-1 48f5cbdd1c is in history

Change-Id: I387c3afcd3ce26cfa6b4032b697104a1c6bbf544