Merge "Remove __ANDROID_API__ #if checks." into sc-dev