Add svt and tk to libmerged

Library_merged.mk

@@ -30,13 +30,13 @@ $(eval $(call gb_Library_add_linked_libs,merged,\
 	cppuhelper \
 	i18nisolang1 \
 	i18npaper \
+    i18nutil \
+    jvmfwk \
 	sal \
 	salhelper \
 	sax \
 	sot \
 	svl \
-	svt \
-	tk \
 	tl \
 	ucbhelper \
 	utl \
@@ -47,6 +47,7 @@ $(eval $(call gb_Library_add_linked_libs,merged,\
 
 $(eval $(call gb_Library_use_externals,merged,\
 	icuuc \
+	jpeg \
 	libxml2 \
 	zlib \
 ))

android/qa/desktop/Makefile

@@ -150,9 +150,7 @@ copy-stuff: buildrcs
 		  stocservices.uno \
 		  store \
 		  svllo \
-		  svtlo \
 		  test \
-		  tklo \
 		  tllo \
 		  ucb1 \
 		  ucbhelper4gcc3 \

android/qa/sc/Makefile

@@ -95,10 +95,8 @@ copy-stuff:
 		  stocservices.uno \
 		  store \
 		  svllo \
-		  svtlo \
 		  textinstream.uno \
 		  test \
-		  tklo \
 		  tllo \
 		  ucb1 \
 		  ucbhelper4gcc3 \

solenv/gbuild/extensions/pre_MergedLibsList.mk

@@ -47,8 +47,10 @@ gb_MERGEDLIBS := \
 	sfx \
 	sofficeapp \
 	spl \
+	svt \
 	svx \
 	svxcore \
+	tk \
 	uui \
 	xo \