Merge "build: use toolchain identifiers in conditions" into integration