[automerger skipped] Handle zip64 extra fields better am: 94fc8b83 -s ours am: 5248e11d -s ours

am skip reason: Merged-In I7da89f8389c09cc99201cff342483c158bd7e9c1 with SHA-1 1e774245 is already in history

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



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