Merge "Cut dependency to libmedia_jni.so"