| Index: build/android/pylib/gtest/test_runner.py
 | 
| diff --git a/build/android/pylib/gtest/test_runner.py b/build/android/pylib/gtest/test_runner.py
 | 
| index 33de7eaaadd5aa549331477f1314b0fcc2a3bdd3..3b9369209f1eca39e4332c51d427e7e4130f425e 100644
 | 
| --- a/build/android/pylib/gtest/test_runner.py
 | 
| +++ b/build/android/pylib/gtest/test_runner.py
 | 
| @@ -263,6 +263,8 @@ class TestRunner(base_test_runner.BaseTestRunner):
 | 
|        logging.warning(e)
 | 
|        if android_commands.IsDeviceAttached(self.device):
 | 
|          raise
 | 
| +    finally:
 | 
| +      self.CleanupSpawningServerState()
 | 
|      # Calculate unknown test results.
 | 
|      # TODO(frankf): Do not break TestResults encapsulation.
 | 
|      all_tests = set(test.split(':'))
 | 
| 
 |