Merge changes I40874c4c,Ia013f48a

* changes:
  Fix __ANDROID_API__ guards for libnativewindow
  Restore __ANDROID_API__ guards for core <android/*> APIs