omni: emulator: never dexpreopt and allow remount

Change-Id: I807e98020e6dfaf5d1c3d4ff5b29b648b999ba47
diff --git a/utils/emulator/common.mk b/utils/emulator/common.mk
index 4ccabe5..5949d9d 100644
--- a/utils/emulator/common.mk
+++ b/utils/emulator/common.mk
@@ -72,25 +72,4 @@
 # Add our overlays
 PRODUCT_PACKAGE_OVERLAYS += vendor/omni/overlay/common
 
-# Enable dexpreopt for all nightlies
-ifeq ($(ROM_BUILDTYPE),NIGHTLY)
-    ifeq ($(WITH_DEXPREOPT),)
-        WITH_DEXPREOPT := true
-    endif
-endif
-# and weeklies
-ifeq ($(ROM_BUILDTYPE),WEEKLY)
-    ifeq ($(WITH_DEXPREOPT),)
-        WITH_DEXPREOPT := true
-    endif
-endif
-# and security releases
-ifeq ($(ROM_BUILDTYPE),SECURITY_RELEASE)
-    ifeq ($(WITH_DEXPREOPT),)
-        WITH_DEXPREOPT := true
-    endif
-endif
-# but not homemades
-#ifeq ($(ROM_BUILDTYPE),HOMEMADE)
-#    WITH_DEXPREOPT := false
-#endif
+WITH_DEXPREOPT := false