cherry-pick ahead of the automerger: Merge "Revert "Fix the mac build.""
am 079e6e4c: Merge "Revert "Fix the mac build.""

* commit '079e6e4cfbd1a0b1ab2e94e6d52a7304321ae597':
  Revert "Fix the mac build."
am 6b265bd4: Merge "Revert "Revert "Fix the mac build."""

* commit '6b265bd4a12e7518a275dddf41c33279bea8e16b':
  Revert "Revert "Fix the mac build.""
am 540e7ee8: Merge "Build on host as 32-bit as there are 64-bit bugs in this code."

* commit '540e7ee8dbf1d7ee72ef45c92efbebcb89bf6d1a':
  Build on host as 32-bit as there are 64-bit bugs in this code.