Use ort strategy when applying patch

ort is faster and fixes bugs in recursive strategy.

Bug: 1260085
Change-Id: Ib8523d45da5cb0beea957b6ab706101d55bdc1f8
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/3276506
Commit-Queue: Anthony Polito <apolito@google.com>
Reviewed-by: Josip Sokcevic <sokcevic@google.com>
Reviewed-by: Anthony Polito <apolito@google.com>

gclient_scm.py

@@ -432,7 +432,7 @@ class GitWrapper(SCMWrapper):
           # in the tree.
           # We pass '--keep-redundant-commits' to ignore those changes.
           self._Capture(['cherry-pick', target_rev + '..' + patch_rev,
-                         '--keep-redundant-commits'])
+                         '--keep-redundant-commits', '--strategy=ort'])
 
       except subprocess2.CalledProcessError as e:
         self.Print('Failed to apply patch.')