Merge "Build on host as 32-bit as there are 64-bit bugs in this code."