Merge "Add zip2zip to dependency of relevant binary targets" am: fddcbb03...

Merge "Add zip2zip to dependency of relevant binary targets" am: fddcbb03 am: 36b13606 am: b938d105

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



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