am d75d6c91: Merge "Fix the mac build."

* commit 'd75d6c91d24c071534ed36db85a1e72b33dc5a10':
  Fix the mac build.