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

Change-Id: I7699f3c6ef3fcf1f16bbfff05f7b238328f8fbd6
diff --git a/core/host_java_library.mk b/core/host_java_library.mk
index d6a688f..cda6e10 100644
--- a/core/host_java_library.mk
+++ b/core/host_java_library.mk
@@ -50,6 +50,8 @@
 
 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.