[automerger skipped] Merge changes I3084f1e2,I7ea6a7bb,I71f588b9 am: 8bf575a845 am: 11cd3180a5 am: 107425320c -s ours

am skip reason: Change-Id I3084f1e294d15a12923958af9170f00413fae2bb with SHA-1 533365793d is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I58b29a942dcecb691921762868339327f8d32fa1