Merge commit 'ec79cd2f7baa7ba941c8343f6d79f0dbfdd5be2a' into HEAD

* commit 'ec79cd2f7baa7ba941c8343f6d79f0dbfdd5be2a':
  Merge webkit.org at r55033 : Update WebKit revision
  Merge webkit.org at r55033 : Update Android-specific LayoutTest expected result
  Merge webkit.org at r55033 : Implement FrameLoaderClient::didTransferChildFrameToNewDocument for Android
  Merge webkit.org at r55033 : Implement PluginPackage::NPVersion for Android
  Merge webkit.org at r55033 : Implement new ChromeClient::iconForFiles method for Android
  Merge webkit.org at r55033 : Fix merge conflicts
  Merge webkit.org at r55033 : Initial merge by git
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
Update to use binary.mk 4.3_r2.1