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

Change-Id: Ie0361ed50f97ae27c617a90be6ff2986bc32d08c