Merge "Fix sdk-mac build."