From CM to AOSP