Merge "Fix macOS build."