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

extensions/shell/browser/shell_content_browser_client.cc

Index: extensions/shell/browser/shell_content_browser_client.cc
diff --git a/extensions/shell/browser/shell_content_browser_client.cc b/extensions/shell/browser/shell_content_browser_client.cc
index 19f0547b86678de2ffb356ae5a77b1acc769a87b..454a787ee38c662a6378286464e924f74a2d1b33 100644
--- a/extensions/shell/browser/shell_content_browser_client.cc
+++ b/extensions/shell/browser/shell_content_browser_client.cc
@@ -253,7 +253,11 @@ void ShellContentBrowserClient::GetAdditionalAllowedSchemesForFileSystem(
 void ShellContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
     const base::CommandLine& command_line,
     int child_process_id,
-    content::FileDescriptorInfo* mappings) {
+    content::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;