Merge "Fix Mac sdk builds"