am 5821e11d: am 7bc49fcf: am 323287ea: Merge "Fix valgrind build."

# Via Android Git Automerger (2) and others
* commit '5821e11d0b577fda45b81f0c9ea13c1c1c5de1a8':
  Fix valgrind build.

libc/include/sys/exec_elf.h

@@ -700,6 +700,8 @@ typedef struct {
 	Elf64_Xword	a_v;		/* 64-bit id */
 } Aux64Info;
 
+/* BEGIN android-changed: these constants should come from <linux/auxvec.h>. */
+#if 0
 /* a_type */
 #define AT_NULL		0	/* Marks end of array */
 #define AT_IGNORE	1	/* No meaning, a_un is undefined */
@@ -740,6 +742,8 @@ typedef struct {
 #define AT_SUN_EMUL_EXECFD 2013 /* coff file descriptor */
 	/* Executable's fully resolved name */
 #define AT_SUN_EXECNAME 2014
+#endif
+/* END android-changed */
 
 /*
  * Note Headers