Allow OpenApkAsset() to open resource files as well as assets.

android_webview/browser/aw_browser_main_parts.cc

Index: android_webview/browser/aw_browser_main_parts.cc
diff --git a/android_webview/browser/aw_browser_main_parts.cc b/android_webview/browser/aw_browser_main_parts.cc
index 4ea656ce92c381c41e5a1c2fa18c14fff4845b14..4e5548ee8db0ee2ffc4b9067f7a3aa6d746ee409 100644
--- a/android_webview/browser/aw_browser_main_parts.cc
+++ b/android_webview/browser/aw_browser_main_parts.cc
@@ -61,7 +61,8 @@ int AwBrowserMainParts::PreCreateThreads() {
       base::android::GetDefaultLocale(),
       NULL,
       ui::ResourceBundle::DO_NOT_LOAD_COMMON_RESOURCES);
-  std::string locale = l10n_util::GetApplicationLocale(std::string()) + ".pak";
+  std::string locale =
+      "assets/" + l10n_util::GetApplicationLocale(std::string()) + ".pak";
   int pak_fd = base::android::OpenApkAsset(locale, &pak_region);
   if (pak_fd != -1) {
     ui::ResourceBundle::CleanupSharedInstance();
@@ -74,7 +75,8 @@ int AwBrowserMainParts::PreCreateThreads() {
 
   // Try to directly mmap the webviewchromium.pak from the apk. Fall back to
   // load from file, using PATH_SERVICE, otherwise.
-  pak_fd = base::android::OpenApkAsset("webviewchromium.pak", &pak_region);
+  pak_fd = base::android::OpenApkAsset("assets/webviewchromium.pak",
+                                       &pak_region);
   if (pak_fd != -1) {
     ui::ResourceBundle::GetSharedInstance().AddDataPackFromFileRegion(
         base::File(pak_fd), pak_region, ui::SCALE_FACTOR_NONE);