am 6bd20ca2: am f0f9b1bd: am ca7616f2: am d5106417: Merge "Fix Mac sdk builds"

* commit '6bd20ca22a4483cd75eb3e66682ec830d8688852':
  Fix Mac sdk builds