Merge "Fix mac SDK build"