Snap for 8547970 from bbe7c690f1fbe714fe06c2107cb3e4d25bc791f2 to tm-release

Change-Id: I655dbf67fcda147e41d55a60c1a4e89ffe1892a5

libc/SECCOMP_ALLOWLIST_COMMON.TXT

diff --git a/libc/SECCOMP_ALLOWLIST_COMMON.TXT b/libc/SECCOMP_ALLOWLIST_COMMON.TXT
index c440f9b..0366fdf 100644
--- a/libc/SECCOMP_ALLOWLIST_COMMON.TXT
+++ b/libc/SECCOMP_ALLOWLIST_COMMON.TXT
@@ -31,6 +31,8 @@
 int open:open(const char*, int, ...)  arm,x86,x86_64
 int stat64:stat64(const char*, struct stat64*)  arm,x86
 ssize_t readlink:readlink(const char*, char*, size_t)  arm,x86,x86_64
+# Needed by ubsan in T? (http://b/229989971)
+int stat(const char*, struct stat*)  arm,x86,x86_64
 
 #
 # Useful new syscalls which we don't yet use in bionic.

tests/gwp_asan_test.cpp

diff --git a/tests/gwp_asan_test.cpp b/tests/gwp_asan_test.cpp
index b442f51..b2c7780 100644
--- a/tests/gwp_asan_test.cpp
+++ b/tests/gwp_asan_test.cpp
@@ -43,7 +43,7 @@
   std::string filter_arg = "--gtest_filter=";
   filter_arg += test_name;
   std::string exec(testing::internal::GetArgvs()[0]);
-  eh.SetArgs({exec.c_str(), "--gtest_also_run_disabled_tests", filter_arg.c_str()});
+  eh.SetArgs({exec.c_str(), "--gtest_also_run_disabled_tests", filter_arg.c_str(), nullptr});
   eh.Run([&]() { execve(exec.c_str(), eh.GetArgs(), eh.GetEnv()); },
          /* expected_exit_status */ 0,
          // |expected_output_regex|, ensure at least one test ran: