Merge "Delete toolchains from their old location"