Merge 4ea6d000 on remote branch

Change-Id: I2b131b74971225449565453831c3c61cc8ea8d38

Android.mk

 LOCAL_PATH := $(call my-dir)
+
+#Disable WFD for selected 32-bit targets
+ifeq ($(call is-board-platform,bengal),true)
+ifeq ($(TARGET_BOARD_SUFFIX),_32)
+WFD_DISABLE_PLATFORM_LIST := bengal
+endif
+endif
+
+ifneq ($(call is-board-platform-in-list,$(WFD_DISABLE_PLATFORM_LIST)),true)
 include $(call all-makefiles-under, $(LOCAL_PATH))
+endif