Make patch for a revert that cannot has conflicts
Add CyanogenMod 10.2 stuff