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

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

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