Merge "Fixing the Mac SDK build"