Merge "remove access ANDROID_VIEW_SURFACE_JNI_ID"