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

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

Index: tools/telemetry/telemetry/core/chrome/android_browser_backend.py
diff --git a/tools/telemetry/telemetry/core/chrome/android_browser_backend.py b/tools/telemetry/telemetry/core/chrome/android_browser_backend.py
index 8bb392db1adbcac61b4e09002ebaa2a01b1907b9..6bdad470f00af72ea2250e66a2f512b3e7635848 100644
--- a/tools/telemetry/telemetry/core/chrome/android_browser_backend.py
+++ b/tools/telemetry/telemetry/core/chrome/android_browser_backend.py
@@ -164,6 +164,10 @@ class AndroidBrowserBackend(browser_backend.BrowserBackend):
     # 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()