Merge "Fix the mac build."