Merge "Restore __ANDROID_API__ guards for camera/media headers"