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

* commit 'afe8a2f61b47e13a8d89e11a5af1788fcb0f3230':
  Fix CTS fail of the test case "android.webkit.cts.WebViewTest#testLoadDataWithBaseUrl"