Merge "Fix MediaCodec FLAC Javadoc" into oc-mr1-dev am: 546c644f27 am: af521c4ced

Change-Id: Id28175d26ec9910e184d5520cdf280e3ab831cf4