Merge "codec2: make C2Param.h compatible with Pie C2Param.h" into qt-dev
am: 6d76d14ef8

Change-Id: Ia1874387fb95fa14d5a49fc598c7ce604c4ecc77