am 7f0ec9ac: am bfe9d08e: Merge "Fix mac build."

* commit '7f0ec9ac316a06b6c0b0a3966973affc92fcaafd':
  Fix mac build.