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

There's some data indicating that adbd on the device sometimes
spontaneously restores its connection.
After running a test, let's kill adbd and forwarder and wait for bit.

Reverts crrev.com/227038: this is not helping.

BUG=
NOTRY=True

Review URL: https://codereview.chromium.org/26186003

git-svn-id: http://src.chromium.org/svn/trunk/src/build@227278 4ff67af0-8c30-449e-8e8b-ad334ec8d88c

android/pylib/android_commands.py

@@ -459,14 +459,6 @@ 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()

android/pylib/perf/test_runner.py

@@ -50,9 +50,7 @@ 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
 
@@ -155,13 +153,6 @@ 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):