revert some repos and add a few toolchains

Change-Id: Iac350175d8c833b42732ca569f95182c6123a509