AOSP ROM with Cherry Picks