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

Change-Id: Id7b90a1a2f4f89e3303e43c1a2a78d7a9587feb3