Update upstream tags to android-4.3_r2.2

Change-Id: Iac15e61b4755e1319c8bdd61321dc68f85865d63
Merge branch 'cm-10.2' of https://github.com/CyanogenMod/android into DJL10.2

Conflicts:
	default.xml

Change-Id: Ic9f997967ef46f0e54942bbb4303dc51e551af77
Fetch my android repo

Change-Id: I3636b9116a71ff4bc33e1f85164acba21ae2011a