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

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

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