Snap for 7737214 from b748b53013964743132f5296d7f21377af939383 to tm-release

Change-Id: I73c0e765fa7aeca4dc72b96ee2fb89bda4c426dc
diff --git a/Android.bp b/Android.bp
index 466f34c..4854a76 100644
--- a/Android.bp
+++ b/Android.bp
@@ -57,7 +57,7 @@
         "-UNDEBUG",
     ],
     target: {
-        linux_glibc: {
+        glibc: {
             cflags: ["-DHAVE_DECL_STRNDUPA"]
         }
     }
diff --git a/port-gnu/elf.h b/port-gnu/elf.h
index 30c42d8..6aae290 100644
--- a/port-gnu/elf.h
+++ b/port-gnu/elf.h
@@ -19,6 +19,7 @@
 #ifndef _ELF_H
 #define	_ELF_H 1
 
+#include <sys/cdefs.h>
 
 __BEGIN_DECLS