Merge "Fix MediaCodec javadoc typo"