Merge "Handle zip64 extra fields better" am: 57c1aa7b am: 5c3a34b3 am: acddbb78

Original change: https://android-review.googlesource.com/c/platform/build/+/2628431



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