Merge "Use memtag_stack variants in make" into main am: 610cd25c

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



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