Merge "Revert^2 "Use -target-feature for MTE"" into main am: 6a184c71 am: d1148378

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



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