Merge "Use patch instead of git apply." am: 0d2d11bc am: 251eac36 am: c3afc51e am: 4b6b6f95

Original change: https://android-review.googlesource.com/c/platform/build/+/2627735



Change-Id: I6f4d9f931c5028665a93cf5af6ed2b51e3411d20
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>