Update upstream tags to android-4.3_r2.2

Change-Id: Iac15e61b4755e1319c8bdd61321dc68f85865d63
Merge branch 'cyanogenmod' into cm-10.2

Signed-off-by: Humberto Borba <humberos@gmail.com>

Conflicts:
	default.xml