[automerger skipped] Fix __ANDROID_API__ guards for libnativewindow am: 6cd5a9021b am: 8433b3e56a  -s ours
am: 16581d89af  -s ours

Change-Id: I4d9d63fb023c685df4ec8a91d5f29477d583551f