Jack up timeouts for buildbots running android tests.

BUG=
TEST=

Review URL: http://codereview.chromium.org/8622002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111025 0039d316-1c4b-4281-b951-d872f2087c98

build/android/test_package.py

@@ -48,6 +48,9 @@ class TestPackage(object):
         timeout = 900
       else:
         timeout = 60
+    # On a VM (e.g. chromium buildbots), this timeout is way too small.
+    if os.environ.get('BUILDBOT_SLAVENAME'):
+      timeout = timeout * 2
     self.timeout = timeout * self.tool.GetTimeoutScale()
     self.dump_debug_info = dump_debug_info