Revert of Reland Reland Switch Chrome Android using v8 arch specific external data name

chrome/chrome_tests_unit.gypi

 # Copyright 2012 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.
 {
   'variables': {
     'chrome_unit_tests_sources': [
       # histograms.xml is analyzed by AboutFlagsHistogramTest, so this
       # dependency is needed to make commit bots run unit_tests on
       # histograms.xml changes.
       '../tools/metrics/histograms/histograms.xml',
@@ skipping 2895 matching lines @@
             'unit_tests',
           ],
           'variables': {
             'test_suite_name': 'unit_tests',
             'isolate_file': 'unit_tests.isolate',
             'android_manifest_path': 'test/android/unit_tests_apk/AndroidManifest.xml',
             'conditions': [
               ['v8_use_external_startup_data==1', {
                 'asset_location': '<(PRODUCT_DIR)/unit_tests_apk/assets',
                 'additional_input_paths': [
-                  '<(PRODUCT_DIR)/unit_tests_apk/assets/natives_blob_<(arch_suffix).bin',
-                  '<(PRODUCT_DIR)/unit_tests_apk/assets/snapshot_blob_<(arch_suffix).bin',
+                  '<(PRODUCT_DIR)/unit_tests_apk/assets/natives_blob.bin',
+                  '<(PRODUCT_DIR)/unit_tests_apk/assets/snapshot_blob.bin',
                 ],
               }],
             ],
           },
           'conditions': [
             ['v8_use_external_startup_data==1', {
               'dependencies': [
                 '../v8/tools/gyp/v8.gyp:v8_external_snapshot',
               ],
               'variables': {
                 'dest_path': '<(asset_location)',
-                'renaming_sources': [
+                'src_files': [
                   '<(PRODUCT_DIR)/natives_blob.bin',
                   '<(PRODUCT_DIR)/snapshot_blob.bin',
                 ],
-                'renaming_destinations': [
-                  'natives_blob_<(arch_suffix).bin',
-                  'snapshot_blob_<(arch_suffix).bin',
-                ],
                 'clear': 1,
               },
               'includes': ['../build/android/copy_ex.gypi'],
             }],
           ],
-          'includes': [
-            '../build/apk_test.gypi',
-            '../build/android/v8_external_startup_data_arch_suffix.gypi'
-          ],
+          'includes': [ '../build/apk_test.gypi' ],
         },
       ],
       'conditions': [
         ['test_isolation_mode != "noop"', {
           'targets': [
             {
               'target_name': 'unit_tests_apk_run',
               'type': 'none',
               'dependencies': [
                 'unit_tests_apk',
@@ skipping 28 matching lines @@
               'dependencies': [
                 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
               ],
             }],
           ],
         },
       ],
     }],
   ],  # 'conditions'
 }