Revert "//tools/perf: Remove bad device for android swarming test bot"

tools/perf/core/perf_data_generator.py

 #!/usr/bin/env python
 # Copyright 2016 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.
 
 """Script to generate chromium.perf.json and chromium.perf.fyi.json in
 the src/testing/buildbot directory and benchmark.csv in the src/tools/perf
 directory. Maintaining these files by hand is too unwieldy.
 """
 import argparse
@@ skipping 171 matching lines @@
       }
     ])
   waterfall = add_tester(
     waterfall, 'Android Swarming N5X Tester',
     'fyi-android-swarming-n5x', 'android',
     swarming=[
       {
        'os': 'Android',
        'android_devices': '1',
        'device_ids': [
-           #'build245-m4--device1', offline, see http://crbug.com/705135
-           'build245-m4--device2',
+           'build245-m4--device1', 'build245-m4--device2',
            'build245-m4--device3', 'build245-m4--device4',
            'build245-m4--device5', 'build245-m4--device6',
            'build245-m4--device7', 'build248-m4--device1',
            'build248-m4--device2', 'build248-m4--device3',
            'build248-m4--device4', 'build248-m4--device5',
            'build248-m4--device6', 'build248-m4--device7',
            'build249-m4--device1', 'build249-m4--device2',
            'build249-m4--device3', 'build249-m4--device4',
            'build249-m4--device5', 'build249-m4--device6',
            'build249-m4--device7'
@@ skipping 550 matching lines @@
 
   all_benchmarks = current_benchmarks(False)
   whitelist_benchmarks = current_benchmarks(True)
   # Get benchmark sharding according to common sharding configurations
   # Currently we only have bots sharded 5 directions and 1 direction
   benchmark_sharding_map = {}
   benchmark_sharding_map['22'] = shard_benchmarks(22, all_benchmarks)
   benchmark_sharding_map['5'] = shard_benchmarks(5, all_benchmarks)
   benchmark_sharding_map['1'] = shard_benchmarks(1, all_benchmarks)
   benchmark_sharding_map['21'] = shard_benchmarks(21, all_benchmarks)
-  # Added because of temporary removal of device in http://crbug.com/705135
-  benchmark_sharding_map['20'] = shard_benchmarks(20, all_benchmarks)
 
   for name, config in waterfall['testers'].iteritems():
     use_whitelist = config['use_whitelist']
     benchmark_list = all_benchmarks
     if use_whitelist:
       benchmark_list = whitelist_benchmarks
     if config.get('swarming', False):
       # Our current configuration only ever has one set of swarming dimensions
       # Make sure this still holds true
       if len(config['swarming_dimensions']) > 1:
@@ skipping 202 matching lines @@
       return 0
     else:
       print ('The perf JSON config files are not up-to-date. Please run %s '
              'without --validate-only flag to update the perf JSON '
              'configs and benchmark.csv.') % sys.argv[0]
       return 1
   else:
     update_all_tests([fyi_waterfall, waterfall])
     update_benchmark_csv()
   return 0