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

Change-Id: I1de34ea1a389fb7a318e1c7d8b6e96c84ef404fe