Added an annotation to label Integration tests.

build/android/pylib/instrumentation/test_runner.py

Index: build/android/pylib/instrumentation/test_runner.py
diff --git a/build/android/pylib/instrumentation/test_runner.py b/build/android/pylib/instrumentation/test_runner.py
index 3ff0744620b561257f63516cdd9ec9e596b7be7e..a5ccd299513882a5352ad624801a12261adc0627 100644
--- a/build/android/pylib/instrumentation/test_runner.py
+++ b/build/android/pylib/instrumentation/test_runner.py
@@ -163,6 +163,9 @@ class TestRunner(base_test_runner.BaseTestRunner):
         os.path.join(constants.DIR_SOURCE_ROOT), self._lighttp_port)
     if self.flags:
       self.flags.AddFlags(['--disable-fre', '--enable-test-intents'])
+      if self.options.device_flags:
+        with open(self.options.device_flags) as device_flags_file:
+          self.flags.AddFlags([flag for flag in device_flags_file])
 
   def TearDown(self):
     """Cleans up the test harness and saves outstanding data from test run."""
@@ -319,6 +322,8 @@ class TestRunner(base_test_runner.BaseTestRunner):
     annotations = self.test_pkg.GetTestAnnotations(test)
     if 'Manual' in annotations:
       return 10 * 60 * 60
+    if 'IntegrationTest' in annotations:
+      return 30 * 60
     if 'External' in annotations:
       return 10 * 60
     if 'EnormousTest' in annotations: