Merge "[Bugfix] Check for presence before ZipWrite" am: bb8d9ed7 am:...

Merge "[Bugfix] Check for presence before ZipWrite" am: bb8d9ed7 am: c3a91529 am: 71880d9d am: 12b6008e am: d3de3172

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



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