Revert "add javavm and jvmfwk to Library_merged"

This reverts commit 77169b9c.

Conflicts:
	Library_merged.mk

Change-Id: Id7c42457127a622cf71910bafc97f69db545243f

Library_merged.mk

@@ -34,6 +34,7 @@ $(eval $(call gb_Library_use_libraries,merged,\
 	cppu \
 	cppuhelper \
 	i18nlangtag \
+    jvmfwk \
 	sal \
 	salhelper \
 	tl \

solenv/gbuild/Library.mk

@@ -123,11 +123,8 @@ $(call gb_ComponentTarget_ComponentTarget,$(2),\
 	$(call gb_Library_get_runtime_filename,$(gb_Library__get_name)))
 $(call gb_Library__get_final_target,$(gb_Library__get_name)) : \
 	$(call gb_ComponentTarget_get_outdir_target,$(2))
-# prevent circular deps: Library_merged -> localedata -> saxparser -> services.rdb -> javavm.component
-ifneq ($(gb_Library__get_name),merged)
 $(call gb_ComponentTarget_get_target,$(2)) :| \
 	$(call gb_Library_get_target,$(gb_Library__get_name))
-endif
 $(call gb_Library_get_clean_target,$(gb_Library__get_name)) : \
 	$(call gb_ComponentTarget_get_clean_target,$(2))
 endef