Merge "Codec2Utils: Add support for media.c2@1.1"