Use right version of get_toolchain_if_necessary.py
Apply our changes again