Merge changes from topic "vts-package" am: ab39096ee7

Change-Id: If8f30e49210ba244c85b12a36a31ddb10f927a0d
diff --git a/core/tasks/vts-core-tests.mk b/core/tasks/vts-core-tests.mk
index 919c08d..f67d722 100644
--- a/core/tasks/vts-core-tests.mk
+++ b/core/tasks/vts-core-tests.mk
@@ -15,9 +15,16 @@
 test_suite_name := vts-core
 test_suite_tradefed := vts-core-tradefed
 test_suite_readme := test/vts/tools/vts-core-tradefed/README
+
+# TODO(b/149249068): Clean up after all VTS tests are converted.
+vts_test_artifact_paths :=
+# Some repo may not include vts project.
+-include test/vts/tools/build/tasks/framework/vts_for_core_suite.mk
+
 include $(BUILD_SYSTEM)/tasks/tools/compatibility.mk
 
 .PHONY: vts-core
+$(compatibility_zip): $(vts_test_artifact_paths)
 vts-core: $(compatibility_zip)
 $(call dist-for-goals, vts-core, $(compatibility_zip))