resolved conflicts for merge of eab5ab5d to mnc-dev-plus-aosp

Change-Id: Ic7ba16887aa778fad6911a4bfb155e91b9b3c88e

diff --cc core/tasks/cts.mk
index 668d5bb,a1fe4e8..c7e4ed6
--- 1/core/tasks/cts.mk
--- 2/core/tasks/cts.mk
+++ b/core/tasks/cts.mk
@@@ -88,16 -86,10 +88,15 @@@ $(foreach m, $(CTS_CORE_CASE_LIST),
      $(eval $(call copy-one-file, $(built), $(installed)))\
      $(eval CTS_CASE_LIST_APKS += $(installed))))
  
- CTS_SHARED_LIBS := \
-       $(HOST_LIBRARY_PATH)/libc++$(HOST_SHLIB_SUFFIX)
 +CTS_CASE_LIST_JARS :=
 +$(foreach m, $(CTS_TEST_JAR_LIST),\
 +  $(eval CTS_CASE_LIST_JARS += $(CTS_TESTCASES_OUT)/$(m).jar))
 +
+ CTS_SHARED_LIBS :=
  
  DEFAULT_TEST_PLAN := $(cts_dir)/$(cts_name)/resource/plans
 -$(cts_dir)/all_cts_files_stamp: $(CTS_CORE_CASES) $(CTS_TEST_CASES) $(CTS_CASE_LIST_APKS) $(JUNIT_HOST_JAR) $(HOSTTESTLIB_JAR) $(CTS_HOST_LIBRARY_JARS) $(TF_JAR) $(VMTESTSTF_JAR) $(CTS_TF_JAR) $(CTS_TF_EXEC_PATH) $(CTS_TF_README_PATH) $(ACP) $(CTS_TEST_JAR_FILES) $(CTS_SHARED_LIBS)
 +$(cts_dir)/all_cts_files_stamp: $(CTS_CORE_CASES) $(CTS_TEST_JAR_FILES) $(CTS_TEST_CASES) $(CTS_CASE_LIST_APKS) $(CTS_CASE_LIST_JARS) $(JUNIT_HOST_JAR) $(HOSTTESTLIB_JAR) $(CTS_HOST_LIBRARY_JARS) $(TF_JAR) $(VMTESTSTF_JAR) $(CTS_TF_JAR) $(CTS_TF_EXEC_PATH) $(CTS_TF_README_PATH) $(ADDITIONAL_TF_JARS) $(ACP) $(CTS_SHARED_LIBS)
 +
  # Make necessary directory for CTS
        $(hide) mkdir -p $(TMP_DIR)
        $(hide) mkdir -p $(PRIVATE_DIR)/docs