Revert 212020 "Move Python setup/tear down logic into Forwarder ..."

trunk/src/build/android/pylib/base/shard.py

Index: trunk/src/build/android/pylib/base/shard.py
===================================================================
--- trunk/src/build/android/pylib/base/shard.py	(revision 212053)
+++ trunk/src/build/android/pylib/base/shard.py	(working copy)
@@ -9,6 +9,7 @@
 
 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
 
@@ -292,6 +293,7 @@
     return (base_test_result.TestRunResults(), constants.ERROR_EXIT_CODE)
 
   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, tests, num_retries, test_timeout)
@@ -300,3 +302,5 @@
       _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)