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