Merge "Fix file path calculation for asset files."

Author: Selim Gurun

core/java/android/webkit/BrowserFrame.java

@@ -742,7 +742,8 @@ private InputStream inputStreamForAndroidResource(String url) {
             url = url.replaceFirst(ANDROID_ASSET, "");
             try {
                 AssetManager assets = mContext.getAssets();
-                return assets.open(url, AssetManager.ACCESS_STREAMING);
+                Uri uri = Uri.parse(url);
+                return assets.open(uri.getPath(), AssetManager.ACCESS_STREAMING);
             } catch (IOException e) {
                 return null;
             }