Stop testing builds with runtime-detected NEON

tools/buildbot_spec.py

 #
 # Copyright 2015 Google Inc.
 #
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 #
 
 #!/usr/bin/env python
 
 usage = '''
@@ skipping 197 matching lines @@
     return {
       'Arm64': 'arm64',
       'x86': 'x86',
       'x86_64': 'x86_64',
       'Mips': 'mips',
       'Mips64': 'mips64',
       'MipsDSP2': 'mips_dsp2',
     }.get(builder_dict['target_arch'], 'arm_v7_neon')
   elif builder_dict.get('os') == 'Android':
     return {
-      'AndroidOne': 'arm_v7_neon',
-      'GalaxyS3': 'arm_v7_neon',
-      'GalaxyS4': 'arm_v7_neon',
-      'Nexus5': 'arm_v7', # This'd be 'nexus_5', but we simulate no-NEON Clank.
-      'Nexus6': 'arm_v7_neon',
-      'Nexus7': 'nexus_7',
-      'Nexus9': 'nexus_9',
-      'Nexus10': 'nexus_10',
-      'NexusPlayer': 'x86',
+      'AndroidOne':    'arm_v7_neon',
+      'GalaxyS3':      'arm_v7_neon',
+      'GalaxyS4':      'arm_v7_neon',
       'NVIDIA_Shield': 'arm64',
+      'Nexus10':       'arm_v7_neon',
+      'Nexus5':        'arm_v7_neon',
+      'Nexus6':        'arm_v7_neon',
+      'Nexus7':        'arm_v7_neon',
+      'Nexus9':        'arm64',
+      'NexusPlayer':   'x86',
     }[builder_dict['model']]
 
   # ChromeOS.
   if 'CrOS' in builder_dict.get('extra_config', ''):
     if 'Link' in builder_dict['extra_config']:
       return 'link'
     if 'Daisy' in builder_dict['extra_config']:
       return 'daisy'
   elif builder_dict.get('os') == 'ChromeOS':
     return {
@@ skipping 127 matching lines @@
   if len(sys.argv) == 2 and sys.argv[1] == 'test':
     self_test()
     sys.exit(0)
 
   if len(sys.argv) != 3:
     print usage
     sys.exit(1)
 
   with open(sys.argv[1], 'w') as out:
     json.dump(get_builder_spec(sys.argv[2]), out)