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

Change-Id: Ib2901670b05c3f33944fadc937eef8dfdc5ed646