am 6b265bd4: Merge "Revert "Revert "Fix the mac build."""

* commit '6b265bd4a12e7518a275dddf41c33279bea8e16b':
  Revert "Revert "Fix the mac build.""