[automerger skipped] Handle symlinks when extracting zipfiles am: 2b2de037 -s ours am: d095ae6d -s ours

am skip reason: Merged-In I7da89f8389c09cc99201cff342483c158bd7e9c1 with SHA-1 94fc8b83 is already in history

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



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