am ccf1cc55: Merge "Fix the mac build."

* commit 'ccf1cc55a4448dc43302624da07d3211356473e2':
  Fix the mac build.