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

trunk/src/tools/telemetry/telemetry/core/chrome/android_browser_backend.py

Index: trunk/src/tools/telemetry/telemetry/core/chrome/android_browser_backend.py
===================================================================
--- trunk/src/tools/telemetry/telemetry/core/chrome/android_browser_backend.py	(revision 212053)
+++ trunk/src/tools/telemetry/telemetry/core/chrome/android_browser_backend.py	(working copy)
@@ -164,6 +164,10 @@
     # Kill old browser.
     self._adb.CloseApplication(self._backend_settings.package)
 
+    adb_commands.Forwarder.KillDevice(self._adb)
+    if not options.keep_test_server_ports:
+      adb_commands.Forwarder.KillHost()
+
     if self._adb.Adb().CanAccessProtectedFileContents():
       if not options.dont_override_profile:
         self._backend_settings.RemoveProfile()