aosp-stable: Adjust patches after rebase