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

Change-Id: I46375e26bbd712695c92fbc441934debefd2f896