Tweak OEM mode

Change-Id: Ic440e33fa22aa7b082097366f10b333cc945362a
diff --git a/Android.mk b/Android.mk
index 2f1f6fc..98c4427 100644
--- a/Android.mk
+++ b/Android.mk
@@ -75,6 +75,12 @@
 LOCAL_SHARED_LIBRARIES += libsparse
 endif
 
+ifeq ($(TW_OEM_BUILD),true)
+    LOCAL_CFLAGS += -DTW_OEM_BUILD
+    BOARD_HAS_NO_REAL_SDCARD := true
+    TW_USE_TOOLBOX := true
+    TW_EXCLUDE_SUPERSU := true
+endif
 ifeq ($(TARGET_USERIMAGES_USE_EXT4), true)
     LOCAL_CFLAGS += -DUSE_EXT4
     LOCAL_C_INCLUDES += system/extras/ext4_utils
@@ -278,9 +284,6 @@
 ifneq ($(wildcard bionic/libc/include/sys/capability.h),)
     LOCAL_CFLAGS += -DHAVE_CAPABILITIES
 endif
-ifeq ($(TW_OEM_BUILD),true)
-    LOCAL_CFLAGS += -DTW_OEM_BUILD
-endif
 
 include $(BUILD_EXECUTABLE)