Merge "Fix host 64-bit build."