am 0b8f52a4: Merge "Revert "Delete toolchains from their old location""

* commit '0b8f52a4dadf56600b702efe9767c8a38d869b8c':
  Revert "Delete toolchains from their old location"