diff --git a/tests/Android.mk b/tests/Android.mk
index 978209febf..0c412415c2 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -69,3 +69,5 @@ LOCAL_PACKAGE_NAME := Launcher3Tests
 LOCAL_INSTRUMENTATION_FOR := Launcher3
 
 include $(BUILD_PACKAGE)
+
+include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/tests/res/raw/aardwolf_dummy_app.apk b/tests/res/raw/aardwolf_dummy_app.apk
index 39fb368ca9..c10732d81b 100644
Binary files a/tests/res/raw/aardwolf_dummy_app.apk and b/tests/res/raw/aardwolf_dummy_app.apk differ