Merge "Media JNI code cleanup"