Merge "Merge commit '6a8690fc8d26c815e798c588f796eabe9d684cf0' into upstream-mas" am: b4ea5c3c54 am: 71f0a6e3bb am: 09d6838ce7 am: b2e4505689

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I36e94b7766d7e0f058550385283a8213309aa82f