Merge "Make bsdiff available in recovery" am: eeb219b8d2 am: 84ddef2e0f am: 0297a3d852

Original change: https://android-review.googlesource.com/c/platform/external/bsdiff/+/1930680

Change-Id: I314d2eeb5e7b63b0451d48d4ff0238d8fed89075