use more bare aosp repo's