am bdabcf4c: am 730d7c53: am 8e1697e7: Merge "Fix mac sdk build."

* commit 'bdabcf4c8bd7c9b5b29e2d3af07a5fb0e2733823':
  Fix mac sdk build.