am cabbe91f: Merge "Fix mac SDK builds."

* commit 'cabbe91ffd6615c9b4d76909ec7fc1fb3db19e00':
  Fix mac SDK builds.