Merge "Fix cpu hint for sw codecs" into qt-dev am: d198b7b7d6
am: f69ef32645

Change-Id: Id39edee3124c5349c1f5787faeffdd56dbc24e3d