Merge "Handle symlinks." into main am: 7cb4e488d4

Original change: https://android-review.googlesource.com/c/platform/development/+/3112468

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