Merge "Remove AndroidRuntime::getJNIEnv() usage from libmedia2_jni"