[automerger skipped] Merge "CCodec: output format duplicated at CCodecConfig" into rvc-dev am: 203ccc21c6 am: 502a6045c8 am: c3a205166e am: 55d42a7956 -s ours am: 1bcbd795fd -s ours
am skip reason: Change-Id Ib63d15830b876c036143de4ce5010ccf8925fbe6 with SHA-1 e4716c09f7 is in history

Change-Id: I3cca63283bc45b58b30940850e3a302fa0b576c0