[automerger skipped] Merge "CCodec: output format duplicated at CCodecConfig" into rvc-dev am: 203ccc21c6 am: 502a6045c8 -s ours am: 439d609930 -s ours am: ebb8ce1c1e -s ours
am skip reason: Change-Id Ib63d15830b876c036143de4ce5010ccf8925fbe6 with SHA-1 274c832c00 is in history

Change-Id: I7a36276fd534a8ae452afaba1cf1d18ebe57db9f