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

Change-Id: Icb2fde87815df0209bd424a4f5441f6ed80ff9c3