Revert "Simplified tools jar resolution + added JDK6 build"

This reverts commit de7b472a7192a0841b23dd46963b7bb34f7a49ab.