Merge "Fix Darwin build."