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

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



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