Merge tag 'android-4.2.2_r1' into HEAD

Conflicts:
	core/Makefile
	core/build_id.mk
	tools/signapk/SignApk.java