Merge changes I3084f1e2,I7ea6a7bb,I71f588b9 am: 8bf575a845

Original change: https://android-review.googlesource.com/c/platform/external/tinycompress/+/1551056

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib472495de7591bd275fe7e359ed76db991389907