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

* commit '092b588b0bcafcab6579407042a5bb0890bc890e':
  Really fix the Mac build.