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

chrome/chrome_android_paks.gypi

 # Copyright (c) 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.
 {
-  'includes': ['../build/android/v8_external_startup_data_arch_suffix.gypi'],
   'variables': {
     'chrome_android_pak_output_folder': '<@(PRODUCT_DIR)/assets/<(package_name)',
     'chrome_android_pak_input_resources': [
       '<(PRODUCT_DIR)/resources.pak',
       '<(PRODUCT_DIR)/chrome_100_percent.pak',
     ],
     'chrome_android_pak_locale_resources': [
       '<(PRODUCT_DIR)/locales/am.pak',
       '<(PRODUCT_DIR)/locales/ar.pak',
       '<(PRODUCT_DIR)/locales/bg.pak',
@@ skipping 46 matching lines @@
     'conditions': [
       ['icu_use_data_file_flag==1', {
         'chrome_android_pak_input_resources': [
           '<(PRODUCT_DIR)/icudtl.dat',
         ],
         'chrome_android_pak_output_resources': [
           '<(chrome_android_pak_output_folder)/icudtl.dat',
         ],
       }],
       ['v8_use_external_startup_data==1', {
+        'chrome_android_pak_input_resources': [
+          '<(PRODUCT_DIR)/natives_blob.bin',
+          '<(PRODUCT_DIR)/snapshot_blob.bin',
+        ],
         'chrome_android_pak_output_resources': [
-          '<(chrome_android_pak_output_folder)/natives_blob_<(arch_suffix).bin',
-          '<(chrome_android_pak_output_folder)/snapshot_blob_<(arch_suffix).bin',
+          '<(chrome_android_pak_output_folder)/natives_blob.bin',
+          '<(chrome_android_pak_output_folder)/snapshot_blob.bin',
         ],
       }],
     ],
   },
   'targets': [
     {
       'target_name': 'chrome_android_paks_copy',
       'type': 'none',
       'dependencies': [
         '<(DEPTH)/chrome/chrome_resources.gyp:packed_resources',
         '<(DEPTH)/chrome/chrome_resources.gyp:packed_extra_resources',
       ],
       'variables': {
         'dest_path': '<(chrome_android_pak_output_folder)',
         'src_files': [
           '<@(chrome_android_pak_input_resources)',
         ],
         'clear': 1,
-        'conditions': [
-          ['v8_use_external_startup_data==1', {
-             'renaming_sources': [
-               '<(PRODUCT_DIR)/snapshot_blob.bin',
-               '<(PRODUCT_DIR)/natives_blob.bin',
-             ],
-             'renaming_destinations': [
-               'snapshot_blob_<(arch_suffix).bin',
-               'natives_blob_<(arch_suffix).bin',
-             ],
-          }],
-        ],
       },
       'includes': ['../build/android/copy_ex.gypi'],
     },
   ],
 }