Merge "Allow bootable/deprecated-ota to use bsdiff" into main