[automerger skipped] codec2: add color formats for image component am: 20b29ddacc am: dc30088fc1 -s ours
am: 61204e542f -s ours
am skip reason: change_id I8233ec928e7c5700abc1bdd7f32e097892947949 with SHA1 20b29ddacc is in history

Change-Id: I9725145cbe9150adde56d6d5ebda4aaf7a0eb179