Merge "Update WebViewFactory.java to compile in AOSP."