Merge "Update CtsShim with multiArch" into oc-mr1-dev
am: 0d2d6b6a86

Change-Id: Idcaf213ed1e081c816f1e6a8fa8a1650f6b04265