Merge (-sours) commit 'a3054d2b31d3e00563e3865d398ef93d25b8b2e0' into HEAD

* commit 'a3054d2b31d3e00563e3865d398ef93d25b8b2e0':
  Refactor find and select dialogs
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