Merge "Properly define hal_codec2 and related policies" into qt-dev