Merge (-sours) commit 'afbc0998ef990403a8e17efb9a384a46707a328e' into HEAD

* commit 'afbc0998ef990403a8e17efb9a384a46707a328e':
  Provide access to current match highlighted.
Merge commit '8e37eff9e07e986e0314f08ed2e079fb8356e831' into HEAD

* commit '8e37eff9e07e986e0314f08ed2e079fb8356e831':
  Adds a couple of missing headers to CachedLinkPrefetch.h
Merge (-sours) commit '7f493d591dfd3492d5916ca301a4dbcd61554a06' into HEAD

* commit '7f493d591dfd3492d5916ca301a4dbcd61554a06':
  Implement the audio tag in webkit -- the corresponding java CL is https://android-git.corp.google.com/g/#change,41406
Merge commit '9f91dd338061945b0999e93d3c34d214f5b2f3db' into HEAD

* commit '9f91dd338061945b0999e93d3c34d214f5b2f3db':
  Choose correct new/delete in case of multiple inheritance.
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
Update to use binary.mk 4.3_r2.1