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

* commit '695a2b3fd9b68f45b6fa1065c1254f88318dd4ca':
  Switch to new locations of toolchains