diff --git a/core/tasks/cts.mk b/core/tasks/cts.mk
index 62e7da36e..8c36ef6bd 100644
--- a/core/tasks/cts.mk
+++ b/core/tasks/cts.mk
@@ -174,7 +174,7 @@ $(call dist-for-goals,cts,$(INTERNAL_CTS_TARGET))
 
 define copy-testcase-apk
 
-$(hide) $(ACP) -fp $(call intermediates-dir-for,APPS,$(1))/package.apk.unaligned \
+$(hide) $(ACP) -fp $(call intermediates-dir-for,APPS,$(1))/package.apk \
 	$(PRIVATE_DIR)/repository/testcases/$(1).apk
 
 endef
diff --git a/target/board/generic_arm5/BoardConfig.mk b/target/board/generic_arm5/BoardConfig.mk
index 685fcb1f7..d8fa2feb7 100644
--- a/target/board/generic_arm5/BoardConfig.mk
+++ b/target/board/generic_arm5/BoardConfig.mk
@@ -19,3 +19,5 @@ include build/target/board/generic/BoardConfig.mk
 TARGET_ARCH_VARIANT :=
 TARGET_CPU_ABI := armeabi
 TARGET_CPU_ABI2 :=
+
+WITH_DEXPREOPT := false