[Android] Convert RestartAdbd to DeviceUtils again.

build/android/pylib/device/device_utils_device_test.py

Index: build/android/pylib/device/device_utils_device_test.py
diff --git a/build/android/pylib/device/device_utils_device_test.py b/build/android/pylib/device/device_utils_device_test.py
index daae2b65fbf33d2aeda673d86e40e2caf330d1ec..2f667bf8b05d12941c5ec0c935a0ae261a3c7574 100755
--- a/build/android/pylib/device/device_utils_device_test.py
+++ b/build/android/pylib/device/device_utils_device_test.py
@@ -207,5 +207,14 @@ class DeviceUtilsPushDeleteFilesTest(unittest.TestCase):
     self.device.RunShellCommand(['rm', '-rf',  _DEVICE_DIR])
     cmd_helper.RunCmd(['rm', '-rf', host_tmp_dir])
 
+  def testRestartAdbd(self):
+    old_adbd_pid = self.device.RunShellCommand(
+        ['ps', '|', 'grep', 'adbd'])[1].split()[1]
+    self.device.RestartAdbd()
+    new_adbd_pid = self.device.RunShellCommand(
+        ['ps', '|', 'grep', 'adbd'])[1].split()[1]
+    self.assertNotEqual(old_adbd_pid, new_adbd_pid)
+
+
 if __name__ == '__main__':
   unittest.main()