am f61c5ad5: am 092b588b: am 9e9b85c3: Merge "Really fix the Mac build."

* commit 'f61c5ad575bbbe40df5ed5b343e734a9094b43cf':
  Really fix the Mac build.