Merge "Codec2: fix up C2Param"