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

* commit '0c3d98b02b74fc64c78e57c07ae6b81eff3a8888':
  Fix 64-bit host build.