AOSP with CM additions