Merge "Switch to new locations of toolchains"