Merge tag 'refs/tags/android-4.2.1_r1' into 'omap-mirror/d-jb-mr1-release'
Merge tag 'refs/tags/android-4.2.1_r1' into 'omap-mirror/d-jb-mr1-release'

Change-Id: I35239aa6b6ed79c2759b1e1f52bc9c42dadcc2dc
Merge omap-mirror/p-jb-mr1-release into omap-mirror/d-jb-mr1-release
Merge tag 'android-4.2.1_r1.2' into p-jb-mr1-release

Android 4.2.1 release 1.2
Merge omap-mirror/p-jb-mr1-release into omap-mirror/d-jb-mr1-release
Merge tag 'android-4.2.2_r1' into HEAD

Android 4.2.2 release 1

Conflicts:
	core/build_id.mk

Change-Id: I7b02bb8161406ac5315e97cc820600d029dd2a3f
Signed-off-by: Roman Shaposhnikov <x0166637@ti.com>
Merge omap-mirror/p-jb-mr1-release into omap-mirror/d-jb-mr1-release
modified mktarball.sh to work with .