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

Change-Id: I5f6cf99832e7182323513e7c278b3998be6af23d