[automerger skipped] Merge "Merge "CCodec: fix i-frame-interval and aac configs" into qt-dev am: 7a92b009 am: d51d99d6" into qt-r1-dev-plus-aosp
am: 825149ef -s ours
am skip reason: change_id I95ad7638148dfdfe7ecb76e8b2682e86c23812e8 with SHA1 0080d7ec is in history

Change-Id: I8628636bf327f75053e7463efdb0eabe8967877f