diff --git a/Android.mk b/Android.mk
index bd7a40974..33672269f 100644
--- a/Android.mk
+++ b/Android.mk
@@ -5,6 +5,14 @@ ifneq ($(filter VER_0_8_X VER_2_1_DEVEL,$(WPA_SUPPLICANT_VERSION)),)
 # TODO: Clean up the Android.mks, reset all the temporary variables at the
 # end of each Android.mk, so that one Android.mk doesn't depend on variables
 # set up in the other Android.mk.
+ifneq ($(TARGET_BUILD_VARIANT), user)
+ifeq ($(shell test $(PLATFORM_VERSION_LAST_STABLE) -ge 8 ; echo $$?), 0)
+include $(LOCAL_PATH)/hostapd/Android.mk \
+        $(LOCAL_PATH)/wpa_supplicant/Android.mk \
+        $(LOCAL_PATH)/hs20/client/Android.mk
+else
 include $(LOCAL_PATH)/hostapd/Android.mk \
         $(LOCAL_PATH)/wpa_supplicant/Android.mk
+endif #End of Check for platform version
+endif #End of Check for target build variant
 endif
diff --git a/hs20/client/Android.mk b/hs20/client/Android.mk
index e4db32208..4d2e5d117 100644
--- a/hs20/client/Android.mk
+++ b/hs20/client/Android.mk
@@ -60,6 +60,14 @@ L_CFLAGS += -DEAP_TLS_OPENSSL
 
 L_CFLAGS += -Wno-unused-parameter
 
+ifneq ($(TARGET_BUILD_VARIANT), user)
+ifeq ($(shell test $(PLATFORM_VERSION_LAST_STABLE) -ge 8 ; echo $$?), 0)
+L_CFLAGS += -DCONFIG_ANDROID_LOG
+L_CFLAGS += -DANDROID_LOG_NAME='"hs20-osu-client"'
+L_CFLAGS += -Wno-error-deprecated-declarations
+L_CFLAGS += -Wno-unused-variable
+endif
+endif
 
 ########################
 include $(CLEAR_VARS)
@@ -68,9 +76,17 @@ LOCAL_MODULE_TAGS := optional
 
 LOCAL_SHARED_LIBRARIES := libc libcutils
 LOCAL_SHARED_LIBRARIES += libcrypto libssl
+ifneq ($(TARGET_BUILD_VARIANT), user)
+ifeq ($(shell test $(PLATFORM_VERSION_LAST_STABLE) -ge 8 ; echo $$?), 0)
+LOCAL_VENDOR_MODULE := true
+LOCAL_SHARED_LIBRARIES += libxml2
+LOCAL_SHARED_LIBRARIES += liblog
+else
 #LOCAL_SHARED_LIBRARIES += libxml2
 LOCAL_STATIC_LIBRARIES += libxml2
 LOCAL_SHARED_LIBRARIES += libicuuc
+endif
+endif
 LOCAL_SHARED_LIBRARIES += libcurl
 
 LOCAL_CFLAGS := $(L_CFLAGS)
diff --git a/hs20/client/osu_client.c b/hs20/client/osu_client.c
index 77b15403c..bf78548a9 100644
--- a/hs20/client/osu_client.c
+++ b/hs20/client/osu_client.c
@@ -10,7 +10,7 @@
 #include <time.h>
 #include <sys/stat.h>
 #ifdef ANDROID
-#include "private/android_filesystem_config.h"
+#include "cutils/android_filesystem_config.h"
 #endif /* ANDROID */
 
 #include "common.h"