extract_utils: use apply instead of am

Fixes applying diffs without git metadata.

Change-Id: I3f55e5819790d0f4620ef5614afd49d20b817f32

Author: luk1337

extract_utils/fixups_blob.py

@@ -286,7 +286,10 @@ def git_add_files(files: List[str]):
 
             for patch in patches:
                 try:
-                    run_cmd(['git', 'am', '--reject', patch])
+                    run_cmd(['git', 'apply', '--reject', patch])
+                    patch_files = self.__get_patch_affected_files(patch)
+                    git_add_files(patch_files)
+                    run_cmd(['git', 'commit', '-m', f'Apply: "{patch}"'])
                 except ValueError as e:
                     color_print(
                         f'Failed to apply patch {patch}',