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

* commit 'f0f9b1bd4010f9584675a83e079e7ab6167bb7ee':
  Fix Mac sdk builds