Merge "Really sync with bzip1.0.8." am: 984a9c5ba9

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

Change-Id: I02a24d63d46ffd20cce96c83c209cae5c08b6100