resolved conflicts for merge of c7f23a58 to jb-mr2-dev-plus-aosp

Change-Id: Ic1ff892898884326151d02a53c15f5bb4bb57c28

diff --cc dx/junit-tests/Android.mk
index ee5e31b,e1f3c41..f999c92
--- 1/dx/junit-tests/Android.mk
--- 2/dx/junit-tests/Android.mk
+++ b/dx/junit-tests/Android.mk
@@@ -4,5 -4,7 +4,6 @@@ LOCAL_PATH := $(call my-dir
  include $(CLEAR_VARS)
  LOCAL_SRC_FILES := $(call all-subdir-java-files)
  LOCAL_JAVA_LIBRARIES := dx junit
 -LOCAL_MODULE_TAGS := optional
+ LOCAL_MODULE_TAGS := tests
  LOCAL_MODULE:= dx-tests
  include $(BUILD_HOST_JAVA_LIBRARY)