Merge efd1525927a84f7ed676ba0173c304ab484693cd on remote branch

Change-Id: I262231edca382497813a1f20e48dfe955d9fc7d7
diff --git a/libdrm_macros.h b/libdrm_macros.h
index 0dca827..5caaa80 100644
--- a/libdrm_macros.h
+++ b/libdrm_macros.h
@@ -45,7 +45,7 @@
 
 #include <sys/mman.h>
 
-#if defined(ANDROID) && !defined(__LP64__)
+#if defined(__BIONIC__) && !defined(__LP64__)
 #include <errno.h> /* for EINVAL */
 
 static inline void *drm_mmap(void *addr, size_t length, int prot, int flags,