track aokp vendor/aokp now that we are merged