Merge "Give bionic's __ANDROID_API__ a more reasonable value."