Use master branch on aosp projects
Last projects to migrate....
And then the AOSP merge it's finish.