Update for complex toolchains based on Carbon upstream