Update upstream refs to android-4.3_r3

Change-Id: I4e6cddf8875955350d3d9c7fb90360b8d7f07629
Remove Focal repositories

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

Change-Id: I36363369e987039f869436fc822e030725f0512d
fix the mismerge
Merge remote-tracking branch 'cm/cm-10.2' into cm-10.2