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

Change-Id: I7e9db0098aeb6069dcd1f048a0cd6f690c947815