Merge "Stop #define'ing __ANDROID_API__."