am 25d928f6: Merge "Update WebViewFactory.java to compile in AOSP."

* commit '25d928f687408058f007051878574ea66691d9dc':
  Update WebViewFactory.java to compile in AOSP.