Revert of Name V8 snapshot according to target architecture (32/64 bit).

android_webview/apk/system_webview_apk_common.gypi

Index: android_webview/apk/system_webview_apk_common.gypi
diff --git a/android_webview/apk/system_webview_apk_common.gypi b/android_webview/apk/system_webview_apk_common.gypi
index b47135261733f996fe2b9516771b98c743942cc4..a8f5b6c4f4def87b01dd219667900ccb6726bd99 100644
--- a/android_webview/apk/system_webview_apk_common.gypi
+++ b/android_webview/apk/system_webview_apk_common.gypi
@@ -18,7 +18,6 @@
     'R_package_relpath': 'com/android/webview/chromium',
     'extensions_to_not_compress': 'pak,bin,dat',
     'asset_location': '<(INTERMEDIATE_DIR)/assets/',
-    'snapshot_copy_files': '<(snapshot_copy_files)',
     # TODO: crbug.com/442348 Update proguard.flags and re-enable.
     'proguard_enabled': 'false',
     'proguard_flags_paths': ['<(DEPTH)/android_webview/apk/java/proguard.flags'],
@@ -27,15 +26,17 @@
       '<@(webview_locales_output_paks)',
       '<(asset_location)/webviewchromium.pak',
       '<(asset_location)/webview_licenses.notice',
-      '<@(snapshot_additional_input_paths)',
-    ],
-    'includes': [
-      '../snapshot_copying.gypi',
     ],
     'conditions': [
       ['icu_use_data_file_flag==1', {
         'additional_input_paths': [
           '<(asset_location)/icudtl.dat',
+        ],
+      }],
+      ['v8_use_external_startup_data==1', {
+        'additional_input_paths': [
+          '<(asset_location)/natives_blob.bin',
+          '<(asset_location)/snapshot_blob.bin',
         ],
       }],
     ],
@@ -46,12 +47,17 @@
       'files': [
         '<@(webview_locales_input_paks)',
         '<(PRODUCT_DIR)/android_webview_assets/webviewchromium.pak',
-        '<@(snapshot_copy_files)',
       ],
       'conditions': [
         ['icu_use_data_file_flag==1', {
           'files': [
             '<(PRODUCT_DIR)/icudtl.dat',
+          ],
+        }],
+        ['v8_use_external_startup_data==1', {
+          'files': [
+            '<(PRODUCT_DIR)/natives_blob.bin',
+            '<(PRODUCT_DIR)/snapshot_blob.bin',
           ],
         }],
       ],