Update with main CyanogenMod