AI 148430: Adding a new CTS test runner that is basically
  a copy of the old one, but resides in android/cts
  and is built and installed as part of the CTS.
  This makes sure we always have the correct test
  runner on a device, so we should see the various
  improvements also on off-the-shelf Cupcake phones.
  BUG=1537738

Automated import of CL 148430
diff --git a/core/tasks/cts.mk b/core/tasks/cts.mk
index 9444377..a09d698 100644
--- a/core/tasks/cts.mk
+++ b/core/tasks/cts.mk
@@ -44,7 +44,8 @@
 	android.core.tests.sql \
 	android.core.tests.text \
 	android.core.tests.xml \
-	android.core.tests.xnet
+	android.core.tests.xnet \
+	android.core.tests.runner
 
 CTS_CASE_LIST := \
 	DeviceInfoCollector \