Merge commit '9a211b99b45f5b1028389349eb946120e849b540' into HEAD

* commit '9a211b99b45f5b1028389349eb946120e849b540':
  set maximum image size

Conflicts:
	WebKit/android/jni/WebSettings.cpp
Merge commit 'e07f6aabbe877315688b586c09a36cbe02b7a2a1' into HEAD

* commit 'e07f6aabbe877315688b586c09a36cbe02b7a2a1':
  Pass the WebView context to the GeolocationService from WebKit
Merge commit '53de43bdc82ec558fea60a19a6da44927e58c3b3' into HEAD

* commit '53de43bdc82ec558fea60a19a6da44927e58c3b3':
  refine text selection

Conflicts:
	WebKit/android/nav/SelectText.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
Fix merge e612cc633d20c1b26f76f6d567e64c91ef8a64f7
Detect if we're a webapp from the meta tag and send a message through
to java land if that is the case.

Requires a frameworks/base change.

b/2766917

Change-Id: I6d4034e6316e27c31a36a06063b5968c654fc756