am 67e30f1d: Merge "Fix broken build on Mac."

* commit '67e30f1d115e46b11f3e261783f46a2161d697ba':
  Fix broken build on Mac.