Merge "Restore __ANDROID_API__ guards for core <android/*> APIs" into pi-dev-plus-aosp