Update upstream tags to android-4.3_r2.2

Change-Id: Iac15e61b4755e1319c8bdd61321dc68f85865d63
Merge remote-tracking branch 'cm/cm-10.2' into cm-10.2

Conflicts:
	default.xml
manifest updates

- I'm going to maintain my p990 repo fork again
- untrack dalvik
- remove my gapps repo (who wants to have it can re-add it and define
the proper buildflag)
Merge with upstream

Change-Id: I9000ff634e7ea23be5b4bd5dfcad1082ef8b6b10