am 770cd7c7: Merge "Fix host 64-bit build."

* commit '770cd7c7e7c18a657f233d86aeecb1d9f3091449':
  Fix host 64-bit build.