Remove Focal repositories

Change-Id: I6e3b9dae36743246ccd6924a8d694e62eafc80da
Update AOSP repositories to android-4.3_r3.1

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

Conflicts:
	default.xml