Merge things from CyanogenMod