resolved conflicts for merge of 9a3b17d1 to jb-mr2-dev

Change-Id: I7699f3c6ef3fcf1f16bbfff05f7b238328f8fbd6

diff --cc core/host_java_library.mk
index d6a688f,438e093..cda6e10
--- 1/core/host_java_library.mk
--- 2/core/host_java_library.mk
+++ b/core/host_java_library.mk
@@@ -50,8 -47,8 +50,10 @@@ endif # LOCAL_BUILD_HOST_DE
  
  include $(BUILD_SYSTEM)/base_rules.mk
  
+ $(full_classes_compiled_jar): PRIVATE_JAVAC_DEBUG_FLAGS := -g
+ 
 +java_alternative_checked_module :=
 +
  # The layers file allows you to enforce a layering between java packages.
  # Run build/tools/java-layers.py for more details.
  layers_file := $(addprefix $(LOCAL_PATH)/, $(LOCAL_JAVA_LAYERS_FILE))