am 08651274: am 27e3913b: am 52dd7cc0: Merge "Fix 64-bit host build."

* commit '0865127430b7651a96115999ca41a3fe0974f4e7':
  Fix 64-bit host build.