Merge "ndk: Fix potential event handling issue in android_native_app_glue"