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

Change-Id: I5d621a874f965ead9399e28364754bd5d71d5006