Merge "media: fix JNI for changed MediaCodecInfo constructor"