Fix sync, and change most repos back to AOKP