replace/track a few AOSP repos