Add i18nlangtag and ucbhelper to libmerged

Change-Id: I717d3289d63787cd8148d480783092868a60873b

Library_merged.mk

@@ -18,13 +18,11 @@ $(eval $(call gb_Library_use_library_objects,merged,\
 $(eval $(call gb_Library_use_libraries,merged,\
 	cppu \
 	cppuhelper \
-	i18nlangtag \
 	$(if $(ENABLE_JAVA), \
 		jvmaccess \
 		jvmfwk) \
 	sal \
 	salhelper \
-	ucbhelper \
 	xmlreader \
 	$(gb_UWINAPI) \
 ))

solenv/gbuild/LinkTarget.mk

@@ -821,12 +821,14 @@ gb_BUILD_HELPER_LIBS := basegfx \
 	comphelper \
 	cppu \
 	cppuhelper \
+	i18nlangtag \
 	reg \
 	sal \
 	salhelper \
 	sax \
 	store \
 	tl \
+	ucbhelper \
 	unoidl \
 	xmlreader \
 

solenv/gbuild/extensions/pre_MergedLibsList.mk

@@ -30,6 +30,7 @@ MERGE_LIBRARY_LIST := \
 	fwi \
 	fwk \
 	$(call gb_Helper_optional,DESKTOP,helplinker) \
+	i18nlangtag \
 	i18npool \
 	i18nutil \
 	lng \
@@ -51,6 +52,7 @@ MERGE_LIBRARY_LIST := \
 	tl \
 	$(if $(filter TRUE,$(ENABLE_TELEPATHY)),tubes) \
 	ucb1 \
+	ucbhelper \
 	ucpexpand1 \
 	ucpfile1 \
 	unoxml \