am 96f60a8c: am ff03bc30: Merge "fix mac sdk build."

* commit '96f60a8cf8a6e8e8c077339a27e417cd15645e1b':
  fix mac sdk build.