diff --git a/core/key_char_map.mk b/core/key_char_map.mk
index 0f112f2..4693743 100644
--- a/core/key_char_map.mk
+++ b/core/key_char_map.mk
@@ -20,8 +20,14 @@
 
 $(LOCAL_BUILT_MODULE) : PRIVATE_SRC_FILES := $(full_src_files)
 
+ifeq ($(BUILD_TINY_ANDROID),true)
+$(LOCAL_BUILT_MODULE) : $(full_src_files)
+	@echo KeyCharMap: $@
+	@mkdir -p $(dir $@)
+	$(hide) touch $@
+else
 $(LOCAL_BUILT_MODULE) : $(full_src_files) $(KCM)
 	@echo KeyCharMap: $@
 	@mkdir -p $(dir $@)
 	$(hide) $(KCM) $(PRIVATE_SRC_FILES) $@
-    
+endif
\ No newline at end of file
diff --git a/core/main.mk b/core/main.mk
index c6475ab..cae2881 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -298,6 +298,7 @@
   ADDITIONAL_BUILD_PROPERTIES += dalvik.vm.dexopt-flags=m=y
 endif
 
+ifneq ($(BUILD_TINY_ANDROID),true)
 # Install an apns-conf.xml file if one's not already being installed.
 ifeq (,$(filter %:system/etc/apns-conf.xml, $(PRODUCT_COPY_FILES)))
   PRODUCT_COPY_FILES += \
@@ -318,6 +319,7 @@
     endif
   endif
 endif
+endif
 
 ADDITIONAL_BUILD_PROPERTIES += net.bt.name=Android
 
@@ -461,7 +463,6 @@
 	build/target \
 	build/tools/acp \
 	build/tools/apriori \
-	build/tools/kcm \
 	build/tools/soslim \
 	external/elfcopy \
 	external/elfutils \
diff --git a/target/product/sdk.mk b/target/product/sdk.mk
index 72ed8b3..36b5a10 100644
--- a/target/product/sdk.mk
+++ b/target/product/sdk.mk
@@ -197,9 +197,9 @@
 	zh_TW
 
 # include available languages for TTS in the system image
-include external/svox/pico/lang/PicoLangDeDeInSystem.mk
-include external/svox/pico/lang/PicoLangEnGBInSystem.mk
-include external/svox/pico/lang/PicoLangEnUsInSystem.mk
-include external/svox/pico/lang/PicoLangEsEsInSystem.mk
-include external/svox/pico/lang/PicoLangFrFrInSystem.mk
-include external/svox/pico/lang/PicoLangItItInSystem.mk
+-include external/svox/pico/lang/PicoLangDeDeInSystem.mk
+-include external/svox/pico/lang/PicoLangEnGBInSystem.mk
+-include external/svox/pico/lang/PicoLangEnUsInSystem.mk
+-include external/svox/pico/lang/PicoLangEsEsInSystem.mk
+-include external/svox/pico/lang/PicoLangFrFrInSystem.mk
+-include external/svox/pico/lang/PicoLangItItInSystem.mk