Updated manifest for android-4.2.1_r1

Change-Id: I6e41cca51895c3d99fe9272d3a42971584a33e82
Updated manifest for android-4.2.1_r1

Change-Id: Ic9f58b4943da242ceb61b347e87623b9e8102805
Manifest for android-4.2.1_r1.1

Change-Id: I669b1eee8d97cfde53770f6ebe609415ea4e8cab
Manifest for android-4.2.1_r1.2

Change-Id: I692f106ca245e411e452d39104af4d0b71ef0fd8
Merge remote-tracking branch 'aosp/android-4.2.1_r1.1' into jb-mr1

Conflicts:
	default.xml

Change-Id: Ib75bb1611a887424cb1ebd96b0985904b600258a
Merge remote-tracking branch 'aosp/android-4.2.1_r1.2' into jb-mr1

Conflicts:
	default.xml

Change-Id: Iaa0f962fe287b3b2cdb898d334bdb45ca32b598f