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

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

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