Manifest for android_4.2.1_r1

Change-Id: I149ebfb238517fd97a41fa9deb335007e95b687a
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
Merge remote-tracking branch 'aosp/android-4.2.1_r1.1' into default

Conflicts:
	default.xml

Change-Id: I7b6d7a89ec53389bdac4945a408dcb83f501b628