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

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