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

Change-Id: Iee12665ad0bc8f3bffeba1c59bd04108df7c3052