Cleanups and Track a bunch of AOKP repos