Merge "Allow libsnapshot to link to libbz." am: 2ef0545ad7 am: 3eb1df41da

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

Change-Id: I08b78692c5d75d358c5a39248501795563720767