Added sub-tools as build-dependencies also