am 01ba7582: am 2c504467: am d6e9a1f5: Merge "Fix Mac build."

* commit '01ba75828232da74cc066df5376812f3387676b9':
  Fix Mac build.