Merge "use __BIONIC__ not __ANDROID__" am: abe911e5f6

Change-Id: I38a69a7d51fc68a025d59aed33e35f40426073d7