Update upstream refs to android-4.3_r3

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

Conflicts:
	default.xml