Merge "Fix the read on a closed zipfile" into rvc-dev am: 21c7d8c5 am: 5465eff6 am: 013a82bb am: b4f4c196

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

Change-Id: I801a4bef828289a94d50f06377e0f662874e01b4