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