Android buildbot reliability fixes.

build/android/run_tests.py

 #!/usr/bin/env python
 # Copyright (c) 2011 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.
 
 """Runs all the native unit tests.
 
 1. Copy over test binary to /data/local on device.
 2. Resources: chrome/unit_tests requires resources (chrome.pak and en-US.pak)
    to be deployed to the device (in /data/local/tmp).
@@ skipping 197 matching lines @@
   buildbot_emulator = None
   attached_devices = []
 
   if options.use_xvfb:
     xvfb = Xvfb()
     xvfb.Start()
 
   if options.use_emulator:
     t = TimeProfile('Emulator launch')
     buildbot_emulator = emulator.Emulator()
-    buildbot_emulator.Reset()
     buildbot_emulator.Launch()
     t.Stop()
     attached_devices.append(buildbot_emulator.device)
   else:
     attached_devices = android_commands.GetAttachedDevices()
 
   if not attached_devices:
     logging.critical('A device must be attached and online.')
     return 1
 
@@ skipping 51 matching lines @@
   if len(args) > 1:
     print 'Unknown argument:', args[1:]
     option_parser.print_usage()
     sys.exit(1)
   run_tests_helper.SetLogLevel(options.verbose_count)
   return Dispatch(options)
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))