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

* commit '73d6dc5cdccedc3def241666aef7562b5fd5b5dd':
  Fix host 64-bit build.