Merge "Make software codecs as VNDK" into oc-mr1-dev
am: 6b8bbef164

Change-Id: Ic6acfe1be1f88261a87cbdbe5801b443ededc0e7