Merge "Reset min_sdk_version of libmedia_jni"