am 8ea833e3: Merge "Fix 64-bit host build."

* commit '8ea833e3df568fbcb3b68cbc5f8143a4a11261c3':
  Fix 64-bit host build.