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

* commit '27e3913b7c95aa15061368f50aada7b6b7c71eb2':
  Fix 64-bit host build.