Merge "Allow bootable/deprecated-ota to use bsdiff" into main am: c532cd4dd8 am: be5087e743

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

Change-Id: I07aae8460b10b4e23f5db5e76267d9403148bc8c
Signed-off-by: Automerger Merge Worker <[email protected]>