am 48d2f681: am 67cad86c: Merge "Fix mac build."

* commit '48d2f68175a79fb4d49301af6753cb8fcdd4501a':
  Fix mac build.