Merge "CCodec: fix i-frame-interval and aac configs" into qt-r1-dev
am: 70255455b7

Change-Id: Id0d61deca0428aa5ac6a3dfc585e987682263ae2