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

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