Merge cherrypicks of ['googleplex-android-review.googlesource.com/33211113'] into 25Q2-release.
Change-Id: I477312f234e802374640e4769672fb5a4263d52e
diff --git a/tests/memtag_globals_test.cpp b/tests/memtag_globals_test.cpp
index ff93e7b..40023b9 100644
--- a/tests/memtag_globals_test.cpp
+++ b/tests/memtag_globals_test.cpp
@@ -46,6 +46,7 @@
TEST_P(MemtagGlobalsTest, test) {
SKIP_WITH_HWASAN << "MTE globals tests are incompatible with HWASan";
#if defined(__BIONIC__) && defined(__aarch64__)
+ SKIP_WITH_NATIVE_BRIDGE; // http://b/242170715
std::string binary = GetTestLibRoot() + "/memtag_globals_binary";
bool is_static = MemtagGlobalsTest::GetParam();
if (is_static) {