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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id56f76519b71ae5044bc2e3fe3f232bade416b4d