[Android] Reenable BattOr tests for android.

tools/perf/benchmarks/benchmark_smoke_unittest.py

 # Copyright 2014 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.
 
 """Run the first page of one benchmark for every module.
 
 Only benchmarks that have a composable measurement are included.
 Ideally this test would be comprehensive, however, running one page
 of every benchmark would run impractically long.
 """
 
 import os
 import sys
 import unittest
 
 from telemetry import benchmark as benchmark_module
 from telemetry.core import discover
 from telemetry.internal.browser import browser_finder
 from telemetry.testing import options_for_unittests
 from telemetry.testing import progress_reporter
 
+from benchmarks import battor
 from benchmarks import image_decoding
 from benchmarks import indexeddb_perf
 from benchmarks import jetstream
 from benchmarks import kraken
 from benchmarks import memory
 from benchmarks import octane
 from benchmarks import rasterize_and_record_micro
 from benchmarks import repaint
 from benchmarks import spaceport
 from benchmarks import speedometer
@@ skipping 54 matching lines @@
     indexeddb_perf,  # Always fails on Win7 & Android Tests builder.
     octane,  # Often fails & take long time to timeout on cq bot.
     rasterize_and_record_micro,  # Always fails on cq bot.
     repaint,  # Often fails & takes long time to timeout on cq bot.
     spaceport,  # Takes 451 seconds.
     speedometer,  # Takes 101 seconds.
     jetstream,  # Take 206 seconds.
     text_selection,  # Always fails on cq bot.
     memory,  # Flaky on bots, crbug.com/513767.
     kraken,  # Flaky on Android, crbug.com/626174.
-    v8_browsing # Flaky on Android, crbug.com/628368.
+    v8_browsing, # Flaky on Android, crbug.com/628368.
+    battor #Flaky on android, crbug.com/618330.
 }
 
 
 def load_tests(loader, standard_tests, pattern):
   del loader, standard_tests, pattern  # unused
   suite = progress_reporter.TestSuite()
 
   benchmarks_dir = os.path.dirname(__file__)
   top_level_dir = os.path.dirname(benchmarks_dir)
 
@@ skipping 32 matching lines @@
       merged_attributes = getattr(method, attribute, set()).union(
           getattr(benchmark, attribute, set()))
       if merged_attributes:
         setattr(method, attribute, merged_attributes)
 
     setattr(BenchmarkSmokeTest, benchmark.Name(), method)
 
     suite.addTest(BenchmarkSmokeTest(benchmark.Name()))
 
   return suite