Relands: Android perf tests: kill adbd on the device after running a test.

build/android/pylib/perf/test_runner.py

Index: build/android/pylib/perf/test_runner.py
diff --git a/build/android/pylib/perf/test_runner.py b/build/android/pylib/perf/test_runner.py
index fec7537f06c31e53d92c50e9a4bb1c4f9c501bda..d145331aece1f10ee76907ef1106fbb7593ee6ea 100644
--- a/build/android/pylib/perf/test_runner.py
+++ b/build/android/pylib/perf/test_runner.py
@@ -50,7 +50,9 @@ import pickle
 import os
 import sys
 
+from pylib import android_commands
 from pylib import constants
+from pylib import forwarder
 from pylib.base import base_test_result
 from pylib.base import base_test_runner
 
@@ -153,6 +155,13 @@ class TestRunner(base_test_runner.BaseTestRunner):
     }
     self._SaveResult(persisted_result)
 
+    try:
+      logging.warning('Unmapping device ports')
+      forwarder.Forwarder.UnmapAllDevicePorts(self.adb)
+      self.adb.KillAdbdDevice()
+    except Exception as e:
+      logging.error('Exception when tearing down device %s', e)
+
     return (output, result_type)
 
   def RunTest(self, test_name):