am 8e1697e7: Merge "Fix mac sdk build."

* commit '8e1697e7528f88985a5d702af53ef5d446f65fa1':
  Fix mac sdk build.