Merge "Fix CTS fail of the test case "android.webkit.cts.WebViewTest#testLoadDataWithBaseUrl""