Merge commit '06f62f25fce1767559d6909f476e36f2b654136d' into HEAD

* commit '06f62f25fce1767559d6909f476e36f2b654136d':
  Added getTouchHighlightRects for the fat point.
Merge commit '27d79a6495971cad26199bdf5dc79abcb1ff1c9e' into HEAD

* commit '27d79a6495971cad26199bdf5dc79abcb1ff1c9e':
  Use the real visibleBounds for the ScrollView's visibleContentRect.
  Report correct window.innerWidth and window.innerHeight.
  Fix popup window default size.
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