Merge commit 'adca91a245695a3f29234ad789d7bb18a1f4a2b1' into HEAD

* commit 'adca91a245695a3f29234ad789d7bb18a1f4a2b1':
  Enable XPATH in Android browser.
Merge commit 'd901f89d79e9b9da8b603079bf549589e83ee8c2' into HEAD

* commit 'd901f89d79e9b9da8b603079bf549589e83ee8c2':
  Add one more clean step to make sure people rebuild webcore for xpath change.

Conflicts:
	CleanSpec.mk
Merge commit '0eec6dc8b27223eddc5f02396f82d4ae887fae02' into HEAD

* commit '0eec6dc8b27223eddc5f02396f82d4ae887fae02':
  Enable XSLT in Android webkit.

Conflicts:
	CleanSpec.mk
Merge commit '9971b753e340168e8b8c26aa0c119b57727526c6' into HEAD

* commit '9971b753e340168e8b8c26aa0c119b57727526c6':
  Remove ANDROID guard now that Android fix to MathExtras.h has been upstreamed
Merge commit 'a6cd65b0a83bcd3503b9c497981d9c384766a4c5' into HEAD

* commit 'a6cd65b0a83bcd3503b9c497981d9c384766a4c5':
  Revert the ANDROID_FIX which is the same as the original.
Merge commit '2171a24e6063b6c60a403946c9ed53d3ebf08762' into HEAD

* commit '2171a24e6063b6c60a403946c9ed53d3ebf08762':
  Fixes the Geolocation mock position timestamp
Merge commit '14764ef27a27de8f3bae5ef277415ef59b8959ff' into HEAD

* commit '14764ef27a27de8f3bae5ef277415ef59b8959ff':
  Add touch event LayoutTests to Android tree (at current WebKit revision, 54731).
Merge commit '9411c893730b8aad3c6c3c0ec693f5a58ec1e81a' into HEAD

* commit '9411c893730b8aad3c6c3c0ec693f5a58ec1e81a':
  Remove Python generated files accidentally added to tree in WebKit merge
Enable XSLT in Android webkit.

Before this change, the libwebcore size is: 4902184 Bytes
After this change, the libwebcore size is: 5103712 Bytes
The diff is: 200KB.

Change-Id: I2554a043c2686de56c802e8a9e02cce604fb25c0
move CachedInput::init() to cpp

The implementation of init() calls bzero, which is defined
in CachedPrefix.h. if CachedInput.h is included directly
bzero may not be defined. It is always defined for
CachedInput.cpp.

http://b/2535696

enter the commit message for your changes. Lines starting

Change-Id: I995498cd4bc611f0f1a45aadf27a1fd330e62410
Do not hide the cursor ring when clicking on a <select> element.

Add a CachedNodeType for <select> elements.  If the cursor node is
a <select> element, do not call setFollowedLink, which would hide
the cursor ring.

Bug 1694023

Change-Id: I2df2e70391b5f5969683b71b1e69bc24cba8946f

Conflicts:
	WebKit/android/nav/WebView.cpp
Merge webkit.org at r55033 : Initial merge by git

Change-Id: I98a4af828067cc243ec3dc5e5826154dd88074b5

Conflicts:
	WebCore/loader/ProgressTracker.cpp
	WebCore/platform/graphics/gtk/MediaPlayerPrivateGStreamer.cpp
	WebKit/mac/WebView/WebDataSource.mm
	WebKit/mac/WebView/WebHTMLView.mm
Merge webkit.org at r55033 : Fix merge conflicts

- Android.v8bindings.mk - Keep ours, conflict due to upstreaming of using DerivedSourcesAllInOne.cpp
- V8Index.h - Keep ours, conflict due to upstreaming of touch events
- GeolocationService.h - Take both, conflict due to Android-specific change for pausing service
- PluginView.cpp - Take both, conflict due to Android-specific change to guard JSC headers
- V8DOMWrapper.cpp - Keep ours, conflict due to addition of WORKERS guards

Change-Id: Ib640e64caecbb8cb31272dbfbc18d95f32f9d126
Merge webkit.org at r55033 : Implement new ChromeClient::iconForFiles method for Android

See http://trac.webkit.org/changeset/54923

Change-Id: I4f163c9716ca5e01b24f04337cf6c813e9faf0f7
Merge webkit.org at r55033 : Implement PluginPackage::NPVersion for Android

See http://trac.webkit.org/changeset/54940

Change-Id: I2c3153606ab0eb9a4598e211def2f07f60eab3da
Merge webkit.org at r55033 : Implement FrameLoaderClient::didTransferChildFrameToNewDocument for Android

This method is required because the latest version of WebKit adds the ability
for an existing Frame object to be relocated in the DOM.
See http://trac.webkit.org/changeset/54938 and http://trac.webkit.org/changeset/53871

Change-Id: I18aaae5f6db005b7a0d29c3d783207fa37548572
Merge webkit.org at r55033 : Update Android-specific LayoutTest expected result

Update the V8 expected output to reflect updated test at r55033.

Change-Id: I35363367af1ed5adf59e0c22e328256e3ac361f3
Merge webkit.org at r55033 : Update WebKit revision

Change-Id: Ie9ba4c69af684735ef4e884c75457738f33f0a3f
Cherry pick of WebKit.org revision r58323. Improves documentation for the TouchStationary handler after discussions in webkit bug 37609.

Change-Id: I347b2c8050505fd8747f46d90596882258451d3f
    Link prefetch support
    http://b/issue?id=2268353

Conflicts:
	WebCore/html/HTMLLinkElement.cpp