Merge commit 'bb35adadf8ffa769733526c7aa9b430642f7521b' into HEAD

* commit 'bb35adadf8ffa769733526c7aa9b430642f7521b':
  Fix a return type bug which is complained by gcc-4.6. If compile this function iwht gcc-4.6, gcc complains that "error: 'GlyphSet::GlyphSet' names the constructor, not the type".
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