Rework core patches for KitKat