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

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

Change-Id: I218d66e4a03d1d64ae956c3fba2de107f12595a1