JOP40D
bump version to 4.2.1

Change-Id: If8206ec632b4e912433eebdfa4aed8dde8f37cb4
JOP40E
JOP40F
JOP40G
Merge tag 'android-4.2.1_r1.2' into jb-mr1

Android 4.2.1 release 1.2

Conflicts:
	core/build_id.mk

Change-Id: I090e6f2fda7b1b6b564ffb430ecfebc38353d4e1