fix aosp fetch and add in manifest folder