Index: lib/sanitizer_common/sanitizer_getauxval.h
===================================================================
--- lib/sanitizer_common/sanitizer_getauxval.h
+++ lib/sanitizer_common/sanitizer_getauxval.h
@@ -33,15 +33,12 @@
 #  define SANITIZER_USE_GETAUXVAL 0
 # endif
 
-# if SANITIZER_USE_GETAUXVAL
-#  include <sys/auxv.h>
-# else
-// The weak getauxval definition allows to check for the function at runtime.
-// This is useful for Android, when compiled at a lower API level yet running
-// on a more recent platform that offers the function.
+// The weak getauxval definition allows to check for the function at runtime. It
+// guarantees to be non-null if SANITIZER_USE_GETAUXVAL is 1. This is useful for
+// Android, when compiled at a lower API level yet running on a more recent
+// platform that offers the function.
 extern "C" SANITIZER_WEAK_ATTRIBUTE
 unsigned long getauxval(unsigned long type);  // NOLINT
-# endif
 
 #endif // SANITIZER_LINUX || SANITIZER_FUCHSIA