Merge "Merge commit '6a8690fc8d26c815e798c588f796eabe9d684cf0' into upstream-mas" am: b4ea5c3c54

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5a777fa5e8cfb5abae10f04c453506225ca99d55