Merge tag 'android-4.2.2_r1' into jb-mr1

Conflicts:
	media/libstagefright/Android.mk