am 9b16b129: Merge "Switch to new locations of toolchains"

* commit '9b16b1293255be054a84e6f39098c7a35357f636':
  Switch to new locations of toolchains