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

* commit 'ca7616f21d51faef34771351caffc3d00c2579dd':
  Fix Mac sdk builds