am 0ee7d8c6: Fix Mac builds, for realz.

* commit '0ee7d8c68b57c02d02f707d6f71c731234d56eec':
  Fix Mac builds, for realz.