Really remove override_isolate_target from chromium.gpu.fyi.json

content/test/gpu/generate_buildbot_json.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.gpu.json and chromium.gpu.fyi.json in
 the src/testing/buildbot directory. Maintaining these files by hand is
 too unwieldy.
 """
 
@@ skipping 2182 matching lines @@
     result = copy.deepcopy(NON_SWARMED_GTESTS[test])
     result['name'] = test
   else:
     if not 'swarming' in result:
       result['swarming'] = {}
     result['swarming'].update({
       'can_use_on_swarming_builders': tester_config['swarming'],
       'dimension_sets': tester_config['swarming_dimensions']
     })
     if is_android(tester_config):
-      # Override the isolate target to get rid of any "_apk" suffix
-      # that would be added by the recipes.
-      if 'test' in result:
-        result['override_isolate_target'] = result['test']
-      else:
-        result['override_isolate_target'] = result['name']
       # Integrate with the unified logcat system.
       result['swarming'].update({
         'cipd_packages': [
           {
             'cipd_package': 'infra/tools/luci/logdog/butler/${platform}',
             'location': 'bin',
             'revision': 'git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c'
           }
         ],
         'output_links': [
@@ skipping 185 matching lines @@
   install_parent_links(WATERFALL)
   install_parent_links(V8_FYI_WATERFALL)
 
   generate_all_tests(FYI_WATERFALL, 'chromium.gpu.fyi.json')
   generate_all_tests(WATERFALL, 'chromium.gpu.json')
   generate_all_tests(V8_FYI_WATERFALL, 'client.v8.fyi.json')
   return 0
 
 if __name__ == "__main__":
   sys.exit(main())