Merge "Improve handling of errors from zipinfo" am: b02043b8 am: 4b3afb77...

Merge "Improve handling of errors from zipinfo" am: b02043b8 am: 4b3afb77 am: 0bbc2d02 am: ce2624cf am: d0cfac15

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

Change-Id: Ib60578ead4ccaa7ba09f628a6c9281c0cc70e6ce
Merged-In: Ib60578ead4ccaa7ba09f628a6c9281c0cc70e6ce
(cherry picked from commit c3fc0cdb)