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

Change-Id: I511da6d59c3b525cb678d6bb08a6cfa8e4e5a94f