Normal AOSP, no CAF

CAF manifest is too messy to maintain, let's try simple AOSP.