Revert^2 "Move most version variable out to relase configs."

69b38b52b672a952eb1a72c937f7a7d9929fec63

Change-Id: I67c9ac7869fcad54f3b0b93a04e9dda5f97861d6
Bug: 306702353
Test: TH and local
diff --git a/core/tasks/cts.mk b/core/tasks/cts.mk
index d05640c..b9f0988 100644
--- a/core/tasks/cts.mk
+++ b/core/tasks/cts.mk
@@ -37,7 +37,7 @@
   cts_platform_release_path := cts/tests/tests/os/assets/platform_releases.txt
   cts_platform_release_string := $(shell cat $(cts_platform_release_path))
 
-  ifeq ($(RELEASE_PLATFORM_VERSION_CODENAME_REL),)
+  ifneq (REL,$(PLATFORM_VERSION_CODENAME))
     ifeq (,$(findstring $(PLATFORM_VERSION),$(cts_platform_version_string)))
       define error_msg
         ============================================================