Merge "Fix Mac build."