Revert "Reland r212020: Move Python setup/tear down logic into Forwarder ..."

build/android/pylib/base/test_dispatcher.py

Index: build/android/pylib/base/test_dispatcher.py
diff --git a/build/android/pylib/base/test_dispatcher.py b/build/android/pylib/base/test_dispatcher.py
index 8e30c2e1733a94c59d8ef9ca23d2d87c8c258e60..03644ecfe61557555630497f6b0326a5401e8e0e 100644
--- a/build/android/pylib/base/test_dispatcher.py
+++ b/build/android/pylib/base/test_dispatcher.py
@@ -21,6 +21,7 @@ import threading
 
 from pylib import android_commands
 from pylib import constants
+from pylib import forwarder
 from pylib.utils import reraiser_thread
 from pylib.utils import watchdog_timer
 
@@ -380,7 +381,7 @@ def RunTests(tests, runner_factory, wait_for_debugger, test_device,
   devices = _GetAttachedDevices(wait_for_debugger, test_device)
 
   logging.info('Will run %d tests: %s', len(tests), str(tests))
-
+  forwarder.Forwarder.KillHost(build_type)
   runners = _CreateRunners(runner_factory, devices, setup_timeout)
   try:
     return _RunAllTests(runners, test_collection_factory,
@@ -390,3 +391,5 @@ def RunTests(tests, runner_factory, wait_for_debugger, test_device,
       _TearDownRunners(runners, setup_timeout)
     except android_commands.errors.DeviceUnresponsiveError as e:
       logging.warning('Device unresponsive during TearDown: [%s]', e)
+    finally:
+      forwarder.Forwarder.KillHost(build_type)