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

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

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



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