Re-track some AOKP repos

Not needed anymore. They merged some commits. :)