backout 6fd717549b5a bug 938510 because b2g desktop builds don't seem to pull tooltool packages