Update manifest for android-4.2.2_r1 merge

Change-Id: I7c046230917d5f23e5839ae6f9c5059c6c43d12f
Fix tag paths

Change-Id: I23f641cc134bcb3a38a0b9cb75a4508b72685c74
Merge branch 'cm-10.1' of github.com:CyanogenMod/android into cm-10.1

Conflicts:
	default.xml

Change-Id: I4c3b42db8185eea53d0e7f4039037cf604f6cb76