Track aokp repos again

Change-Id: I20962270816333174d433c92c8ba90147927ae07