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

Change-Id: I7dcd15c0def7bc3e4879eb22940fe6f7d1f694ca