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

* commit '52dd7cc0bddbe6092f818827efd584466234d67b':
  Fix 64-bit host build.