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

build_overrides/v8.gni

Index: build_overrides/v8.gni
diff --git a/build_overrides/v8.gni b/build_overrides/v8.gni
index ee1b66601ca92bfaa63b8baacb4d8ac6720cb712..f1f27de3937e413faa1a4afd3255215bade29207 100644
--- a/build_overrides/v8.gni
+++ b/build_overrides/v8.gni
@@ -22,3 +22,21 @@ v8_use_external_startup_data = !(is_win || is_ios)
 v8_extra_library_files = []
 v8_experimental_extra_library_files =
     [ "../third_party/WebKit/Source/core/streams/ByteLengthQueuingStrategy.js" ]
+
+if (is_android) {
+  v8_external_startup_data_renaming_sources = [
+    "$root_out_dir/natives_blob.bin",
+    "$root_out_dir/snapshot_blob.bin",
+  ]
+  if (current_cpu == "arm" || current_cpu == "x86" || current_cpu == "mipsel") {
+    v8_external_startup_data_renaming_destinations = [
+      "natives_blob_32.bin",
+      "snapshot_blob_32.bin",
+    ]
+  } else {
+    v8_external_startup_data_renaming_destinations = [
+      "natives_blob_64.bin",
+      "snapshot_blob_64.bin",
+    ]
+  }
+}