Merge "Add vendor codec type to support the vendor config and capability"