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