am 87ad7cdc: am e1ba39aa: Merge "Fix 64-bit host build."

* commit '87ad7cdc590aa4033f0b7ae23d83e2fbc119d07a':
  Fix 64-bit host build.