Merge commit '261291fef7ca788b3e1282bb2a80f8936d6196ad' into HEAD

* commit '261291fef7ca788b3e1282bb2a80f8936d6196ad':
  Added setXSSAuditorEnabled support in WebSettings.
Merge commit '1b7019689392c62db7283d1378025c2835765a85' into HEAD

* commit '1b7019689392c62db7283d1378025c2835765a85':
  Don't dereference the frame when there isn't one in rel=apple-touch-icon links http://b/issue?id=2789499
Merge commit '98794f2c8bc5c69ead813669d61843a3d01c713a' into HEAD

* commit '98794f2c8bc5c69ead813669d61843a3d01c713a':
  Don't use the validity of the border color to determine whether the border will be drawn, but instead use the appearance, which is effectively what webkit uses to decide whether to draw its border http://b/issue?id=2661748
Merge commit 'bb37fd6d72e3ef13721bfb25c5eaa50f86c5322a' into HEAD

* commit 'bb37fd6d72e3ef13721bfb25c5eaa50f86c5322a':
  Check "email" input as some sites use it as the username.
Update to use system/core/include 4.2.2_r1.2

Conflicts:
	WebCore/loader/ProgressTracker.cpp
	WebCore/platform/graphics/gtk/MediaPlayerPrivateGStreamer.cpp
	WebKit/mac/WebView/WebDataSource.mm
	WebKit/mac/WebView/WebHTMLView.mm

Conflicts:
	WebKit/android/nav/WebView.cpp

Conflicts:
	JavaScriptCore/wtf/Assertions.h
	WebCore/plugins/mac/PluginViewMac.cpp
	WebKit/mac/Plugins/WebBaseNetscapePluginStream.mm
Update to use binary.mk 4.3_r2.1
Fix build
Fix merge e612cc633d20c1b26f76f6d567e64c91ef8a64f7