Merge commit '6c67d2432fd6eddf638e4d50f7de5ae791ed22b6' into HEAD

* commit '6c67d2432fd6eddf638e4d50f7de5ae791ed22b6':
  Merge WebKit at r60074: Update WEBKIT_MERGE_REVISION
  Merge WebKit at r60074: Update Android-specific expected LayoutTests results
  Merge WebKit at r60074: Remove ANDROID_EXPOSE_COLUMN_GAP as RenderBlock::columnGap() is now public
  Merge WebKit at r60074: RenderStyle color accessors are now private
  Merge WebKit at r60074: Pass null DeviceOrientationClient to Page constructor
  Merge WebKit at r60074: Fix Android makefiles
  Merge WebKit at r60074: Fix conflicts
  Merge WebKit at r60074: Initial merge by git
  Remove the unnecessary return keyword.
  Refix http://b/issue?id=2509597.
  Choose right operator new/delete in case of multiple inheritance.

Conflicts:
	WebCore/rendering/InlineFlowBox.cpp
	WebCore/rendering/RenderBlock.cpp
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