Remove Duplicate CTS-TF Plan

Bug 5563917

This is the same as the CTS plan now. Keeping CTS instead of
CTS-TF allows me to get rid of the rewrite plan code we had.

Change-Id: I583ea8c0cb678a179d92e813c5f970648b01c1f9
diff --git a/tools/tradefed-host/src/com/android/cts/tradefed/testtype/CtsTest.java b/tools/tradefed-host/src/com/android/cts/tradefed/testtype/CtsTest.java
index c78b71b..b18d7cc 100644
--- a/tools/tradefed-host/src/com/android/cts/tradefed/testtype/CtsTest.java
+++ b/tools/tradefed-host/src/com/android/cts/tradefed/testtype/CtsTest.java
@@ -41,8 +41,6 @@
 import com.android.tradefed.testtype.IShardableTest;
 import com.android.tradefed.util.xml.AbstractXmlParser.ParseException;
 
-import junit.framework.Test;
-
 import java.io.BufferedInputStream;
 import java.io.File;
 import java.io.FileInputStream;
@@ -59,6 +57,8 @@
 import java.util.Queue;
 import java.util.Set;
 
+import junit.framework.Test;
+
 /**
  * A {@link Test} for running CTS tests.
  * <p/>
@@ -634,10 +634,6 @@
         if (mCtsBuild == null) {
             throw new IllegalArgumentException("missing CTS build");
         }
-        if ("CTS".equals(mPlanName)) {
-            CLog.i("Switching to CTS-TF plan instead of CTS plan for faster execution of vm-tests");
-            mPlanName = "CTS-TF";
-        }
     }
 
     /**
diff --git a/tools/utils/buildCts.py b/tools/utils/buildCts.py
index 9eb26af..3a07432 100755
--- a/tools/utils/buildCts.py
+++ b/tools/utils/buildCts.py
@@ -110,7 +110,6 @@
     plan.Exclude('android\.core\.vm-tests')
     plan.Exclude('android\.performance.*')
     self.__WritePlan(plan, 'CTS')
-    self.__WritePlan(plan, 'CTS-TF')
 
     plan.Exclude(r'android\.tests\.sigtest')
     plan.Exclude(r'android\.core.*')