Merge "media/codec2: remove erroneous enum type" into rvc-dev