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

Change-Id: I3d428622caa9f4b7ca9a2f57c4a7c9b23cd2c495