Merge sal_textenc into sal just on Android

sal/Library_sal.mk

@@ -132,7 +132,7 @@ $(eval $(call gb_Library_add_cobjects,sal,\
 	sal/osl/all/filepath \
 ))
 
-ifeq ($(MERGELIBS),TRUE)
+ifeq ($(OS),ANDROID)
 $(eval $(call gb_Library_add_exception_objects,sal,\
 	sal/textenc/context \
 	sal/textenc/convertbig5hkscs \

sal/Module_sal.mk

@@ -35,7 +35,7 @@ $(eval $(call gb_Module_add_targets,sal,\
 	$(if $(filter $(OS),ANDROID), \
 		Library_lo-bootstrap) \
 	Library_sal \
-	$(if $(filter TRUE,$(MERGELIBS)),, \
+	$(if $(filter $(OS),ANDROID),, \
 		Library_sal_textenc) \
 	$(if $(filter $(OS),WNT), \
 		Library_uwinapi) \

sal/textenc/textenc.cxx

@@ -364,7 +364,7 @@ static ImplTextEncodingData const aImplJavaUtf8TextEncodingData
 
 namespace {
 
-#if defined IOS || defined LIBO_MERGELIBS
+#if defined IOS || defined ANDROID
 
 extern "C" ImplTextEncodingData const * sal_getFullTextEncodingData(
     rtl_TextEncoding); // from tables.cxx in sal_textenc library