Merge "Fix mac build."