am 079e6e4c: Merge "Revert "Fix the mac build.""

* commit '079e6e4cfbd1a0b1ab2e94e6d52a7304321ae597':
  Revert "Fix the mac build."