Merge "Fix MediaCodec FLAC Javadoc" into oc-mr1-dev am: 546c644f am: af521c4c am: 98274d96 am: 9868e4c7 Change-Id: I60a049225fd042ee6c559c0a1dcbc99b4b49d92e