resolved conflicts for merge of ad892b2c to honeycomb-plus-aosp

Change-Id: Ic76b6f74f2bd73828211122ef4b06d79d0fd25bb
diff --git a/CtsTestCaseList.mk b/CtsTestCaseList.mk
index 0a9c79e..08a0039 100644
--- a/CtsTestCaseList.mk
+++ b/CtsTestCaseList.mk
@@ -12,9 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-CTS_APPS_LIST := \
-    CtsVerifier
-
 CTS_SECURITY_APPS_LIST := \
 	CtsAppAccessData \
 	CtsAppWithData \
@@ -77,6 +74,5 @@
 	SignatureTest \
 	ApiDemos \
 	ApiDemosReferenceTest \
-	$(CTS_APPS_LIST) \
 	$(CTS_COVERAGE_TEST_CASE_LIST) \
 	$(CTS_SECURITY_APPS_LIST)