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