Revert "Remote hosttestlib as dependency"

This reverts commit b5be417a18e3df7828554f031ed0683a1f759f6e.

Reason for revert: there are still modules which use hosttestlib.

Change-Id: Id1bcd8083258100a8413238c15819f2e46a6c7fc
diff --git a/build/tradefed_binary.go b/build/tradefed_binary.go
index 29565fd..8598458 100644
--- a/build/tradefed_binary.go
+++ b/build/tradefed_binary.go
@@ -80,6 +80,7 @@
 			"tradefed",
 			"tradefed-test-framework",
 			"loganalysis",
+			"hosttestlib",
 			"compatibility-host-util",
 		}
 
diff --git a/test_defs.sh b/test_defs.sh
index 1d9cf57..cc92685 100644
--- a/test_defs.sh
+++ b/test_defs.sh
@@ -21,6 +21,7 @@
 
 COMMON_JARS="
     ddmlib-prebuilt\
+    hosttestlib\
     tradefed"
 
 checkFile() {
diff --git a/tools/cts-tradefed/etc/cts-tradefed b/tools/cts-tradefed/etc/cts-tradefed
index 23227a9..2811e37 100755
--- a/tools/cts-tradefed/etc/cts-tradefed
+++ b/tools/cts-tradefed/etc/cts-tradefed
@@ -88,6 +88,7 @@
 JARS="tradefed
   tradefed-test-framework
   loganalysis
+  hosttestlib
   compatibility-host-util
   compatibility-host-util-tests
   cts-tradefed