Update manifest for android-4.2.2_r1 merge

Change-Id: I7c046230917d5f23e5839ae6f9c5059c6c43d12f

Conflicts:
	default.xml
update:default.xml

Change-Id: I23f641cc134bcb3a38a0b9cb75a4508b72685c74

Conflicts:
	default.xml