Merge "Update libmedia2_jni build dependencies"