Merge "Move files to libmedia2_jni_core"