am 80879a6e: (-s ours) am 695a2b3f: am 9b16b129: Merge "Switch to new locations of toolchains"

* commit '80879a6ea4be133c222911055d83e3e43dc15be5':
  Switch to new locations of toolchains