JOP40D
bump version to 4.2.1

Change-Id: If8206ec632b4e912433eebdfa4aed8dde8f37cb4
JOP40E
JOP40F
JOP40G
Merge tag 'android-4.2.1_r1.2' of https://android.googlesource.com/platform/build into HEAD

Android 4.2.1 release 1.2