Merge "Revert "[hwasan] remove workaround for fixed toolchain issue"" into...

Merge "Revert "[hwasan] remove workaround for fixed toolchain issue"" into main am: a09c4bf8 am: 5e20af62 am: f176e3d1 am: ca4a41ee am: 3839f405

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



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