Merge commit '43fbbb2aa64694b5006656423cd74e4ab1e65fba' into HEAD

* commit '43fbbb2aa64694b5006656423cd74e4ab1e65fba':
  Initial messaging model for project 'smoke'
Merge commit 'bd9835293313631ebfffd6bdbeb2686bdf624dfe' into HEAD

* commit 'bd9835293313631ebfffd6bdbeb2686bdf624dfe':
  Dump child frames data according to Mac/Qt implementation for layout tests.
Merge commit 'd4ba65d8a1e77ab591518e878fd081b73cfaaa98' into HEAD

* commit 'd4ba65d8a1e77ab591518e878fd081b73cfaaa98':
  Fix for b/2786464
Merge commit 'a678e0b94a7f6e108d3650393d5eed3c65fefa4f' into HEAD

* commit 'a678e0b94a7f6e108d3650393d5eed3c65fefa4f':
  Enable complex scripts support compiling by deafult.
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