Merge "Remove __ANDROID_API__ guards"