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

Change-Id: Ia170091a3702c05bd01f4f257d5f851c43579465