am 44fc5bfc: (-s ours) Merge "Delete toolchains from their old location"

* commit '44fc5bfce38dda8f7d02c37274b4995349d959bf':
  Delete toolchains from their old location