Merge "Use zip2zip to copy zipfiles" am: a59e5b7a29 am: 8c53b320ed am: aa651b93b0 am: eea4d5b3af

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

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