Merge "media: add codec2_config_prop"