am 3ee7b367: Merge "Fix the Mac build on x86-64."

* commit '3ee7b36798d0f3042ca6198124186cb5e6b7f2bc':
  Fix the Mac build on x86-64.