Merge "Lose native_app_glue and ndk_helper to ndk/."