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

Change-Id: I6c55079e222a450556cdb8c4986cd7185e9fa3d2