Track more AOSP stuff, less CyanogenMod