diff -urb mesa-12.0.4/src/gallium/targets/dri/Makefile.am mesa-12.0.4b/src/gallium/targets/dri/Makefile.am
--- mesa-12.0.4/src/gallium/targets/dri/Makefile.am	2016-11-10 23:46:09.000000000 +0200
+++ mesa-12.0.4b/src/gallium/targets/dri/Makefile.am	2016-11-30 19:21:12.022022585 +0200
@@ -1,10 +1,8 @@
 include $(top_srcdir)/src/gallium/Automake.inc
 
-if HAVE_ANDROID
 if HAVE_SHARED_GLAPI
 SHARED_GLAPI_LIB = $(top_builddir)/src/mapi/shared-glapi/libglapi.la
 endif
-endif
 
 AM_CFLAGS = \
 	-I$(top_srcdir)/src/mapi \
diff -urb mesa-12.0.4/src/mesa/drivers/dri/Makefile.am mesa-12.0.4b/src/mesa/drivers/dri/Makefile.am
--- mesa-12.0.4/src/mesa/drivers/dri/Makefile.am	2016-11-10 23:46:09.000000000 +0200
+++ mesa-12.0.4b/src/mesa/drivers/dri/Makefile.am	2016-11-30 19:20:55.755564181 +0200
@@ -6,12 +6,10 @@
 
 SUBDIRS+=common
 
-# On Android, we need to explicitly link to libglapi.so.
-if HAVE_ANDROID
+# To use libglvnd, we need to explicitly link to libglapi.so.
 if HAVE_SHARED_GLAPI
 SHARED_GLAPI_LIB = $(top_builddir)/src/mapi/shared-glapi/libglapi.la
 endif
-endif
 
 if HAVE_I915_DRI
 SUBDIRS += i915