Switch to new name for toolchain

Change-Id: I8edb82e895f0c1bce9c06d0651bd1971007219d6