Fix force stop using wrong "ps" cmd.

devil/devil/android/sdk/adb_wrapper.py

 # Copyright 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """This module wraps Android's adb tool.
 
 This is a thin wrapper around the adb interface. Any additional complexity
 should be delegated to a higher level (ex. DeviceUtils).
 """
 
@@ skipping 117 matching lines @@
   class PersistentShell(object):
     '''Class to use persistent shell for ADB.
 
     This class allows a persistent ADB shell to be created, where multiple
     commands can be passed into it. This avoids the overhead of starting
     up a new ADB shell for each command.
 
     Example of use:
     with PersistentShell('123456789') as pshell:
         pshell.RunCommand('which ls')
-        pshell.RunCommandAndClose('echo TEST')
+        pshell.RunCommand('echo TEST', close=True)
     '''
     def __init__(self, serial):
       """Initialization function:
 
       Args:
         serial: Serial number of device.
       """
       self._cmd = [AdbWrapper.GetAdbPath(), '-s', serial, 'shell']
       self._process = None
 
@@ skipping 759 matching lines @@
   @property
   def is_emulator(self):
     return _EMULATOR_RE.match(self._device_serial)
 
   @property
   def is_ready(self):
     try:
       return self.GetState() == _READY_STATE
     except device_errors.CommandFailedError:
       return False