Merge "CCodec: fix i-frame-interval and aac configs" into qt-dev
am: 7a92b009df

Change-Id: I0e3d791baca36ca7c2f782fd565e10684e19e24d