[automerger skipped] Merge "Fix __ANDROID_API__ guards for libnativewindow" am: c7e81c3aaf  -s ours am: cfc7917440  -s ours
am: 0e2ef88de2  -s ours

Change-Id: I380a96d249d2d10c604470f5f1447197e3db33c0