Merge "Make software codecs as VNDK" into oc-mr1-dev