Merge "Make software codecs as VNDK" into oc-mr1-dev am: e901b52af3
am: 1014c9c226

Change-Id: I87a86b42fe5ba791bcdc1fe174b0bf330da503bf