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

* commit 'b0501ab66ddf82f5d3b6aa99734e14a1e27c916a':
  Fix host 64-bit build.