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

Change-Id: I1dd0de6e7c63fd6199def4578aef323af9322f90