aosp-stable: Better handle patch process