Manifest for android-4.2.1_r1.2

Change-Id: I692f106ca245e411e452d39104af4d0b71ef0fd8
Merge tag 'android-4.2.1_r1.2' into default

Android 4.2.1 release 1.2

Conflicts:
	default.xml

Change-Id: I1730588eee8d5658a97b25b683d876c9d1003826