am d5106417: Merge "Fix Mac sdk builds"

* commit 'd510641759d0cd769bc2bb397db001a6bd656617':
  Fix Mac sdk builds