Merge "decompressor maintenence" into main am: 86f037c2 am: 76a163f2 am: 9c2e66ee

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2699453



Change-Id: Iafd85c9123b959b7eef2048331f2fb8a447ab120
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>