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

content/content.gyp

Index: content/content.gyp
diff --git a/content/content.gyp b/content/content.gyp
index f1a2a973f5afe5161b90f73931056a9d0f611420..b90477e1b925044fb080183aaafeb4c7061a1141 100644
--- a/content/content.gyp
+++ b/content/content.gyp
@@ -630,34 +630,36 @@
           ],
         },
         {
-          'target_name': 'content_shell_assets_copy',
-          'type': 'none',
-          'dependencies': ['content_shell_and_tests.gyp:content_shell_pak'],
-          'variables': {
-            'src_files': ['<(PRODUCT_DIR)/content_shell.pak'],
-            'conditions': [
-              ['v8_use_external_startup_data==1', {
-                'dependencies': ['<(DEPTH)/v8/tools/gyp/v8.gyp:v8_external_snapshot'],
-                'renaming_sources': [
-                  '<(PRODUCT_DIR)/natives_blob.bin',
-                  '<(PRODUCT_DIR)/snapshot_blob.bin',
-                ],
-                'renaming_destinations': [
-                  'natives_blob_<(arch_suffix).bin',
-                  'snapshot_blob_<(arch_suffix).bin',
-                ],
-              }],
-              ['icu_use_data_file_flag==1', {
-                'dependencies': ['<(DEPTH)/third_party/icu/icu.gyp:icudata'],
-                'src_files': ['<(PRODUCT_DIR)/icudtl.dat'],
-              }],
-            ],
-            'dest_path': '<(PRODUCT_DIR)/content_shell/assets',
-            'clear': 1,
-          },
-          'includes': [
-            '../build/android/copy_ex.gypi',
-            '../build/android/v8_external_startup_data_arch_suffix.gypi',
+          'target_name': 'content_icudata',
+          'type': 'none',
+          'conditions': [
+            ['icu_use_data_file_flag==1', {
+              'copies': [
+                {
+                  'destination': '<(PRODUCT_DIR)/content_shell/assets',
+                  'files': [
+                    '<(PRODUCT_DIR)/icudtl.dat',
+                  ],
+                },
+              ],
+            }],
+          ],
+        },
+        {
+          'target_name': 'content_v8_external_data',
+          'type': 'none',
+          'conditions': [
+            ['v8_use_external_startup_data==1', {
+              'copies': [
+                {
+                  'destination': '<(PRODUCT_DIR)/content_shell/assets',
+                  'files': [
+                    '<(PRODUCT_DIR)/natives_blob.bin',
+                    '<(PRODUCT_DIR)/snapshot_blob.bin',
+                  ],
+                },
+              ],
+            }],
           ],
         },
       ],