Switch to full AOSP