Adapt python scripts to use the new Forwarder2

build/android/pylib/base_test_runner.py

Index: build/android/pylib/base_test_runner.py
diff --git a/build/android/pylib/base_test_runner.py b/build/android/pylib/base_test_runner.py
index a69d0244b603a58e2472cbb47171fbf65f1fa23d..26ddc17f9a921c331f9c364640940de2026551c9 100644
--- a/build/android/pylib/base_test_runner.py
+++ b/build/android/pylib/base_test_runner.py
@@ -137,7 +137,7 @@ class BaseTestRunner(object):
     # Sometimes the forwarder device port may be already used. We have to kill
     # all forwarder processes to ensure that the forwarder can be started since
     # currently we can not associate the specified port to related pid.
-    self.adb.KillAll('forwarder')
+    self.adb.KillAll('device_forwarder')
     if self._forwarder:
       self._forwarder.Close()
     self._forwarder = Forwarder(
@@ -168,7 +168,7 @@ class BaseTestRunner(object):
     if self._forwarder or self._spawner_forwarder:
       # Kill all forwarders on the device and then kill the process on the host
       # (if it exists)
-      self.adb.KillAll('forwarder')
+      self.adb.KillAll('device_forwarder')
       if self._forwarder:
         self._forwarder.Close()
       if self._spawner_forwarder: