Added some missing packages needed to build, tools build still failing, however.