diff --git a/vendor/rockchip/common/apps/DeviceTest/Android.mk b/vendor/rockchip/common/apps/DeviceTest/Android.mk
index a172869146..ee776a375e 100644
--- a/vendor/rockchip/common/apps/DeviceTest/Android.mk
+++ b/vendor/rockchip/common/apps/DeviceTest/Android.mk
@@ -24,24 +24,7 @@ include $(BUILD_PREBUILT)
 
 endif
 
-ifeq ($(strip $(TARGET_PRODUCT)), rk3288_AIO_box)
 
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-LOCAL_MODULE := DeviceTest
-LOCAL_MODULE_CLASS := APPS
-LOCAL_MODULE_TAGS := optional
-LOCAL_BUILT_MODULE_STEM := package.apk
-LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
-#LOCAL_PRIVILEGED_MODULE :=
-LOCAL_CERTIFICATE := PRESIGNED
-#LOCAL_OVERRIDES_PACKAGES := 
-LOCAL_SRC_FILES := $(LOCAL_MODULE)_AIO.apk
-#LOCAL_REQUIRED_MODULES :=
-LOCAL_PREBUILT_JNI_LIBS := lib/libserial_port.so \
-						   lib/libdrm_devicetest.so
-
-else
 
 LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
@@ -57,5 +40,4 @@ LOCAL_SRC_FILES := $(LOCAL_MODULE).apk
 #LOCAL_REQUIRED_MODULES :=
 LOCAL_PREBUILT_JNI_LIBS := lib/libserial_port.so \
                            lib/libdrm_devicetest.so
-endif
 include $(BUILD_PREBUILT)
diff --git a/vendor/rockchip/common/apps/DeviceTest/DeviceTest.apk b/vendor/rockchip/common/apps/DeviceTest/DeviceTest.apk
index 324b0945e3..17eb277b90 100644
Binary files a/vendor/rockchip/common/apps/DeviceTest/DeviceTest.apk and b/vendor/rockchip/common/apps/DeviceTest/DeviceTest.apk differ
diff --git a/vendor/rockchip/common/apps/DeviceTest/DeviceTest_AIO.apk b/vendor/rockchip/common/apps/DeviceTest/DeviceTest_AIO.apk
deleted file mode 100644
index c5b08e9860..0000000000
Binary files a/vendor/rockchip/common/apps/DeviceTest/DeviceTest_AIO.apk and /dev/null differ
diff --git a/vendor/rockchip/common/apps/DeviceTest/lib/libdrm_devicetest.so b/vendor/rockchip/common/apps/DeviceTest/lib/libdrm_devicetest.so
index be1082e9bc..f5c50ad046 100644
Binary files a/vendor/rockchip/common/apps/DeviceTest/lib/libdrm_devicetest.so and b/vendor/rockchip/common/apps/DeviceTest/lib/libdrm_devicetest.so differ
diff --git a/vendor/rockchip/common/apps/DeviceTest/lib/libserial_port.so b/vendor/rockchip/common/apps/DeviceTest/lib/libserial_port.so
index 7cb39230a3..6c361fd142 100644
Binary files a/vendor/rockchip/common/apps/DeviceTest/lib/libserial_port.so and b/vendor/rockchip/common/apps/DeviceTest/lib/libserial_port.so differ