am 2ce8e605: Merge "Fix Mac build."

* commit '2ce8e60513cab4fc95448af709a2232984815c7b':
  Fix Mac build.