diff a/droid-hal-$DEVICE.spec b/droid-hal-$DEVICE.spec
--- a/droid-hal-$DEVICE.spec
+++ b/droid-hal-$DEVICE.spec

+%define android_config \
+#define MALI_QUIRKS 1\ (or WANT_ADRENO_QUIRKS)
+%{nil}

 %include dhd/droid-hal-device.inc



With the following patch to upstream libhybris:


diff --git a/hybris/common/Makefile.am b/hybris/common/Makefile.am
index 20438f6..71d7012 100644
--- a/hybris/common/Makefile.am
+++ b/hybris/common/Makefile.am
@@ -7,7 +7,7 @@ if !WANT_ARCH_ARM64
 SUBDIRS += jb
 endif

-if WANT_EXPERIMENTAL
+if WANT_LINKER_MM
 SUBDIRS += mm
 endif

@@ -62,7 +62,7 @@ endif
 if !WANT_ARCH_ARM64
 libhybris_common_la_CPPFLAGS += -DWANT_LINKER_JB
 endif
-if WANT_EXPERIMENTAL
+if WANT_LINKER_MM
 libhybris_common_la_CPPFLAGS += -DWANT_LINKER_MM
 endif
 if WANT_ARM_TRACING
diff --git a/hybris/common/hooks.c b/hybris/common/hooks.c
index 29987b9..498543f 100644
--- a/hybris/common/hooks.c
+++ b/hybris/common/hooks.c
@@ -73,6 +73,8 @@
 #include <hybris/properties/properties.h>
 #include <hybris/common/hooks.h>

+#include <android-config.h>
+
 #ifdef WANT_ARM_TRACING
 #include "wrappers.h"
 #endif
diff --git a/hybris/configure.ac b/hybris/configure.ac
index 1bbe083..1888d60 100644
--- a/hybris/configure.ac
+++ b/hybris/configure.ac
@@ -46,7 +46,7 @@ AC_ARG_ENABLE(experimental,
   [  --enable-experimental     Enable experimental features (default=disabled)],
   [experimental=$enableval],
   [experimental="no"])
-AM_CONDITIONAL( [WANT_EXPERIMENTAL], [test x"$experimental" = x"yes"])
+AM_CONDITIONAL( [WANT_MM_LINKER], [test x"$experimental" = x"yes"])

 AC_ARG_ENABLE(adreno_quirks,
   [  --enable-adreno-quirks     Enable adreno quirks (default=disabled)],
@@ -215,6 +215,7 @@ AC_MSG_NOTICE("Android headers version is $android_headers_major.$android_header

 # Add automake tests for version/API needs here that you need in code, including test .am's
 AM_CONDITIONAL([HAS_ANDROID_7_0_0], [test $android_headers_major -ge 7 -a $android_headers_minor -ge 0 ])
+AM_CONDITIONAL([HAS_ANDROID_6_0_0], [test $android_headers_major -ge 6 -a $android_headers_minor -ge 0 ])
 AM_CONDITIONAL([HAS_ANDROID_5_0_0], [test $android_headers_major -ge 5 -a $android_headers_minor -ge 0 ])
 AM_CONDITIONAL([HAS_ANDROID_4_2_0], [test $android_headers_major -ge 4 -a $android_headers_minor -ge 2 ])
 AM_CONDITIONAL([HAS_ANDROID_4_1_0], [test $android_headers_major -ge 4 -a $android_headers_minor -ge 1 ])
@@ -222,6 +223,9 @@ AM_CONDITIONAL([HAS_ANDROID_4_0_3], [test $android_headers_major -ge 4 -a $andro
 AM_CONDITIONAL([HAS_ANDROID_4_0_0], [test $android_headers_major -ge 4 -a $android_headers_minor -ge 0 ])
 AM_CONDITIONAL([HAS_ANDROID_2_3_0], [test $android_headers_major -ge 2 -a $android_headers_minor -ge 3 ])

+# Automatically enable MM linker for Android 6 (previously known as "experimental feature")
+AM_CONDITIONAL([WANT_MM_LINKER], [test $android_headers_major -ge 6 -a $android_headers_minor -ge 0 ])
+
 AC_ARG_ENABLE(mali-quirks,
   [  --enable-mali-quirks            Enable Mali GPU driver quirks (default=disabled)],
   [mali_quirks=$enableval],
@@ -297,7 +301,7 @@ echo "  debug build.............: $debug"
 echo
 echo "  trace...................: $trace"
 echo
-echo "  experimental features...: $experimental"
+echo "  mm linker...............: $experimental"
 echo
 echo "  prefix..................: $prefix"
 echo