Merge with CyanogenMod repository