Merge changes I3084f1e2,I7ea6a7bb,I71f588b9 am: 8bf575a845 am: 11cd3180a5

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I64897a55b9c9759af84f50be737d107915408e0b