Switch to new name for toolchain

Change-Id: I0f78352cf8e0ac9680fd08ff0c4fbc7c39e863b7