Merge "Fix 64-bit host build."