Merge "Fix the read on a closed zipfile" into rvc-dev am: 21c7d8c5c6

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

Change-Id: I4111bdee72e6fd9ac36000f9f217e178ed21b1ae