Merge "use __BIONIC__ not __ANDROID__"