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

content/content_shell.gypi

Index: content/content_shell.gypi
diff --git a/content/content_shell.gypi b/content/content_shell.gypi
index a5147072141f5a7616f1b1b9ec316989032d3ae9..e170e3488434a5c7d4e0c5ab22a931451a7639e6 100644
--- a/content/content_shell.gypi
+++ b/content/content_shell.gypi
@@ -403,6 +403,16 @@
             'browser/devtools/devtools_resources.gyp:devtools_resources',
           ],
         }],
+        ['OS=="android"', {
+          'copies': [
+            {
+              'destination': '<(PRODUCT_DIR)',
+              'files': [
+                '<(PRODUCT_DIR)/content_shell/assets/content_shell.pak'
+              ],
+            },
+          ],
+        }],
         ['toolkit_views==1', {
           'dependencies': [
             '<(DEPTH)/ui/views/resources/views_resources.gyp:views_resources'
@@ -427,7 +437,6 @@
               '<(SHARED_INTERMEDIATE_DIR)/ui/strings/app_locale_settings_en-US.pak',
               '<(SHARED_INTERMEDIATE_DIR)/ui/strings/ui_strings_en-US.pak',
             ],
-            'pak_output': '<(PRODUCT_DIR)/content_shell.pak',
             'conditions': [
               ['toolkit_views==1', {
                 'pak_inputs': [
@@ -436,6 +445,9 @@
               }],
               ['OS!="android"', {
                 'pak_inputs': ['<(SHARED_INTERMEDIATE_DIR)/blink/devtools_resources.pak',],
+                'pak_output': '<(PRODUCT_DIR)/content_shell.pak',
+              }, {
+                'pak_output': '<(PRODUCT_DIR)/content_shell/assets/content_shell.pak',
               }],
             ],
           },
@@ -908,8 +920,9 @@
           'target_name': 'content_shell_apk',
           'type': 'none',
           'dependencies': [
-            'content.gyp:content_shell_assets_copy',
+            'content.gyp:content_icudata',
             'content.gyp:content_java',
+            'content.gyp:content_v8_external_data',
             'content_java_test_support',
             'content_shell_java',
             'libcontent_shell_content_view',