Merge "build: use new toolchain variables for tools" into integration