am 71c4cea5: Merge "Fix Mac build."

* commit '71c4cea525eb6a84d0763a42d241f50c9c2ac8d2':
  Fix Mac build.