Merge "Fix MediaCodec FLAC Javadoc" into oc-mr1-dev