Merge "bionic now has ElfXX_Chdr..."
am: 0cb208dc6f

Change-Id: I7c69c87d4d0e203b37af4bd411f1663c71ba886d
diff --git a/config.h b/config.h
index 858b447..a5caf49 100644
--- a/config.h
+++ b/config.h
@@ -95,10 +95,14 @@
 #endif
 
 /* Define to 1 if the system has the type `Elf32_Chdr'. */
-//#define HAVE_ELF32_CHDR 1
+#ifdef __ANDROID__
+#define HAVE_ELF32_CHDR 1
+#endif
 
 /* Define to 1 if the system has the type `Elf64_Chdr'. */
-//#define HAVE_ELF64_CHDR 1
+#ifdef __ANDROID__
+#define HAVE_ELF64_CHDR 1
+#endif
 
 /* Define to 1 if you have the <endian.h> header file. */
 #define HAVE_ENDIAN_H 1