Make race flag override match upstream

Use the upstream convention for overriding the -race flag.