Move aosp to it's own manifest