Merge "Reapply "Handle symlinks in sbox"" into main am: a1eb34a7 am: 50bf81ca

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



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