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