Merge "Ignore -C codegen-units flag"