aosp-stable: Remove patch for issue 274153002 and better handle patches with/without upstream Chromium