remove AOSP patch