Merge tag 'android-4.2.2_r1' into jellybean

Android 4.2.2 release 1

Conflicts:
	libexternal/external.cpp
	libhwcomposer/hwc.cpp
	libhwcomposer/hwc_mdpcomp.cpp
	libhwcomposer/hwc_mdpcomp.h
	libhwcomposer/hwc_vsync.cpp