Merge "Revert^3 "Use -target-feature for MTE"" into main am: 2e14f9ac am: 623d1df0

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



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