Merge "Remove 64bit variant of software codecs" into oc-mr1-dev