Merge "Fix choosing wrong diff tool for recovery-from-boot patch" am: 3aa46441

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



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