Update upstream tags to android-4.3_r2.2

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

Conflicts:
	default.xml

Change-Id: Ifea772220fde3a6dc082a45e37baf64c0843578a