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

build/android/pylib/android_commands.py

Index: build/android/pylib/android_commands.py
diff --git a/build/android/pylib/android_commands.py b/build/android/pylib/android_commands.py
index eff561e80ca96593cc5410d3888a520103d27eba..9f0d5cf40e3597061865a0fc717937500b11ed2b 100644
--- a/build/android/pylib/android_commands.py
+++ b/build/android/pylib/android_commands.py
@@ -459,6 +459,14 @@ class AndroidCommands(object):
     if out.strip() != 'remount succeeded':
       raise errors.MsgException('Remount failed: %s' % out)
 
+  def KillAdbdDevice(self):
+    logging.info('Killing adbd on the device...')
+    adb_pids = self.ExtractPid('adbd')
+    if adb_pids:
+      self.RunShellCommandWithSU('kill %s' % ' '.join(adb_pids))
+    logging.info('Waiting for device to settle...')
+    time.sleep(5)
+
   def RestartAdbServer(self):
     """Restart the adb server."""
     ret = self.KillAdbServer()