Load non-locale .pak files directly from the .apk on Android (rather than extracting on start-up).

content/shell/browser/shell_content_browser_client.h

Index: content/shell/browser/shell_content_browser_client.h
diff --git a/content/shell/browser/shell_content_browser_client.h b/content/shell/browser/shell_content_browser_client.h
index 0568691ae3550b24623a6ce9c40a7bbd40ad992d..fedd055666105e1bee814acbec885e48a264ad88 100644
--- a/content/shell/browser/shell_content_browser_client.h
+++ b/content/shell/browser/shell_content_browser_client.h
@@ -71,12 +71,18 @@ class ShellContentBrowserClient : public ContentBrowserClient {
                const OpenURLParams& params,
                const base::Callback<void(WebContents*)>& callback) override;
 
-#if defined(OS_POSIX) && !defined(OS_MACOSX)
+#if defined(OS_ANDROID)
   void GetAdditionalMappedFilesForChildProcess(
       const base::CommandLine& command_line,
       int child_process_id,
-      FileDescriptorInfo* mappings) override;
-#endif
+      content::FileDescriptorInfo* mappings,
+      std::map<int, base::MemoryMappedFile::Region>* regions) override;
+#elif defined(OS_POSIX) && !defined(OS_MACOSX)
+  void GetAdditionalMappedFilesForChildProcess(
+      const base::CommandLine& command_line,
+      int child_process_id,
+      content::FileDescriptorInfo* mappings) override;
+#endif  // defined(OS_ANDROID)
 #if defined(OS_WIN)
   void PreSpawnRenderer(sandbox::TargetPolicy* policy, bool* success) override;
 #endif