Switch some recafs to an aosp base for now