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

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

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