Merge "CtsShim: build tweaks for 64-bit only builds." am: a869d14343 am: a4428dc5e4
am: 60108dce1c

Change-Id: Ifc575a70b4b2fda3155353c78239a35220cf4b7d