Merge "Simplify ziputils" into main am: d5bf16acde am: 686d448568 am: c358fed295

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/2782509

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