Merge "Move the copysign() family over to builtins all the time."
diff --git a/libc/include/sys/eventfd.h b/libc/include/sys/eventfd.h
index 1b6ad29..1ad11e3 100644
--- a/libc/include/sys/eventfd.h
+++ b/libc/include/sys/eventfd.h
@@ -62,7 +62,7 @@
  *
  * Returns 0 on success, or returns -1 otherwise.
  */
-int eventfd_read(int __fd, eventfd_t* __value);
+int eventfd_read(int __fd, eventfd_t* _Nonnull __value);
 
 /**
  * [eventfd_write(3)](http://man7.org/linux/man-pages/man2/eventfd.2.html) is a convenience
diff --git a/tests/gwp_asan_test.cpp b/tests/gwp_asan_test.cpp
index 5f5e3dd..38661c7 100644
--- a/tests/gwp_asan_test.cpp
+++ b/tests/gwp_asan_test.cpp
@@ -34,6 +34,7 @@
 #if defined(__BIONIC__)
 
 #include "android-base/file.h"
+#include "android-base/test_utils.h"
 #include "gwp_asan/options.h"
 #include "platform/bionic/malloc.h"
 #include "sys/system_properties.h"
@@ -57,7 +58,13 @@
 // the torture mode is is generally 40,000, so that svelte devices don't
 // explode, as this uses ~163MiB RAM (4KiB per live allocation).
 TEST(gwp_asan_integration, malloc_tests_under_torture) {
-  RunGwpAsanTest("malloc.*:-malloc.mallinfo*");
+  if (running_with_hwasan()) {
+    // Skip the malloc.zeroed tests since they fail in this particular config.
+    // TODO(b/267386540): Need to fix this problem.
+    RunGwpAsanTest("malloc.*:-malloc.mallinfo*:malloc.zeroed*");
+  } else {
+    RunGwpAsanTest("malloc.*:-malloc.mallinfo*");
+  }
 }
 
 class SyspropRestorer {