aosp-stable: Modify patches after rebase to aosp upstream 0429