aosp ALL the things

CAF is a broken turd burger right now