Merge "Fix in MediaMuxer's JNI code"