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

Change-Id: I49f0696119d1aa52e420fa7c676a448d569ea941