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