Add NDEBUG build

Change-Id: I81032fb43d6b4919bd264a644062dc31ae564427
diff --git a/Android.mk b/Android.mk
index 0c8b579..8a791fe 100644
--- a/Android.mk
+++ b/Android.mk
@@ -21,15 +21,10 @@
 include $(build_path)/Android.common.mk
 
 include $(build_path)/Android.libart.mk
-include $(build_path)/Android.test.mk
 include $(build_path)/Android.aexec.mk
 
-ifeq ($(WITH_HOST_DALVIK),true)
-    include $(build_path)/Android.libart.host.mk
-    include $(build_path)/Android.test.host.mk
-    include $(build_path)/Android.aexec.host.mk
-endif
-
+include $(build_path)/Android.libarttest.mk
+include $(build_path)/Android.test.mk
 
 # "m build-art" for quick minimal build
 .PHONY: build-art