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

Change-Id: I5d9acc00e06799dec506162e2f53c2a2ebc2fbdd