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

Change-Id: I1fe2abdc628e79b6fde6067ae06152e908735427