Merge "Use libnativewindow for platform variant of android_native_app_glue" am: e6a50a2266

Change-Id: I1f884576cb2b5db7707ef13f057c6880ba86d2f6