Merge "cts: fix build for 64-bit"