Merge 77796d95042b67ba2dcf77b2c98f95e74cea4d3a on remote branch

Change-Id: I6213b45faa1ae4c015b527d48c0e743e6f8959f4
diff --git a/Android.mk b/Android.mk
index f8f2bb4..5d03591 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,9 +1,10 @@
 LOCAL_PATH := $(call my-dir)
+WFD_DISABLE_PLATFORM_LIST := neo anorak
 
 #Disable WFD for selected 32-bit targets
 ifeq ($(call is-board-platform,bengal),true)
 ifeq ($(TARGET_BOARD_SUFFIX),_32)
-WFD_DISABLE_PLATFORM_LIST := bengal
+WFD_DISABLE_PLATFORM_LIST += bengal
 endif
 endif