[KitKat] Add and remove some patches