Fix mkexfatfs exclusion when TW_NO_EXFAT enabled

Push to android-5.0

Conflicts:
	Android.mk

Change-Id: I0b831a4e6e52e4b314751035b750e6a398cb4d2d
diff --git a/Android.mk b/Android.mk
index 207ee16..e10fef1 100644
--- a/Android.mk
+++ b/Android.mk
@@ -313,7 +313,6 @@
     flash_image \
     fix_permissions.sh \
     mke2fs.conf \
-    mkexfatfs \
     pigz \
     teamwin \
     toolbox_symlinks \
@@ -333,6 +332,9 @@
 ifneq ($(TW_USE_TOOLBOX), true)
     LOCAL_ADDITIONAL_DEPENDENCIES += busybox_symlinks
 endif
+ifneq ($(TW_NO_EXFAT), true)
+    LOCAL_ADDITIONAL_DEPENDENCIES += mkexfatfs
+endif
 ifeq ($(BOARD_HAS_NO_REAL_SDCARD),)
     LOCAL_ADDITIONAL_DEPENDENCIES += parted
 endif