Merge "CCodec: output format duplicated at CCodecConfig" am: 26a5773f3b am: 71e8b09645

Change-Id: I6b56fc364e8060089e9595069f2c54ea03c9a286