Merge "Apply changes to the WebView for compatibility with r5967 of Skia." into master-chromium