Merge "Fix the Mac build on x86-64."