Merge "[automerger skipped] Add zip2zip as a required module of...

Merge "[automerger skipped] Add zip2zip as a required module of releasetools_common. am: 74d947d2 -s ours am: 94d74fbc -s ours am: a981b595 -s ours" into udc-qpr-dev-plus-aosp am: 95155be9 -s ours

am skip reason: Merged-In I7ff1189122aac4915d411b50a6cc76bd76d658f6 with SHA-1 74d947d2 is already in history

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



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