Merge "Handle symlinks when extracting zipfiles" am: 0e5e1749 am: f6399f8b...

Merge "Handle symlinks when extracting zipfiles" am: 0e5e1749 am: f6399f8b am: 444bb1c0 am: 767b6bc6 am: 4e33f13f

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



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