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

Change-Id: I6691bb658052abcd3c8332019558b056312acb8c