Store and load icudtl.dat directly from the apk rather than extracting on start-up

content/shell/browser/shell_content_browser_client.cc

Index: content/shell/browser/shell_content_browser_client.cc
diff --git a/content/shell/browser/shell_content_browser_client.cc b/content/shell/browser/shell_content_browser_client.cc
index 4a2e95c26a0ef851819e97116967a9a2042f8656..2d4587869a006c5ae010790ff54f758606f4e901 100644
--- a/content/shell/browser/shell_content_browser_client.cc
+++ b/content/shell/browser/shell_content_browser_client.cc
@@ -341,7 +341,11 @@ void ShellContentBrowserClient::OpenURL(
 void ShellContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
     const base::CommandLine& command_line,
     int child_process_id,
-    FileDescriptorInfo* mappings) {
+    FileDescriptorInfo* mappings
+#if defined(OS_ANDROID)
+    , std::map<int, base::MemoryMappedFile::Region>* regions
+#endif
+    ) {
 #if defined(V8_USE_EXTERNAL_STARTUP_DATA)
   if (v8_natives_fd_.get() == -1 || v8_snapshot_fd_.get() == -1) {
     int v8_natives_fd = -1;