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

Change-Id: I58102f85aec282782cb2f412ea495524c7939aee