Merge "Fix build for libmedia2_jni"