Merge commit 'ded190db41af0886b9cf1a4a86597e8d8dd06d5d' into HEAD

* commit 'ded190db41af0886b9cf1a4a86597e8d8dd06d5d':
  implement Canvas.toDataURL
  check for null on extremely large images
  Update Android to reflect upstreamed code to avoid Geolocation leaks
Merge commit 'b31073102b4df9c6f531ad939e5d0f4d8880a9e5' into HEAD

* commit 'b31073102b4df9c6f531ad939e5d0f4d8880a9e5':
  Fix a binding big in WebKit which prevents url hijacking for mobile adsense.
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