Merge "Allow bootable/deprecated-ota to use bzip2" into main am: 4811a5bda0 am: 5366ce5ae6

Original change: https://android-review.googlesource.com/c/platform/external/bzip2/+/3027297

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