Merge "Fix __ANDROID_API__ guards for libnativewindow"