diff --git a/Android.d8.mk b/Android.d8.mk
index 7cd679d..ffacf4b 100644
--- a/Android.d8.mk
+++ b/Android.d8.mk
@@ -40,9 +40,6 @@
 
 LOCAL_MODULE_TAGS := optional
 
-LOCAL_C_INCLUDES += \
-	external/icu/icu4c/source/common
-
 LOCAL_CFLAGS := \
 	-Wno-unused-parameter \
 	-std=gnu++0x
diff --git a/Android.libv8.mk b/Android.libv8.mk
index 3421073..b167898 100644
--- a/Android.libv8.mk
+++ b/Android.libv8.mk
@@ -134,10 +134,9 @@
 
 LOCAL_SRC_FILES_$(TARGET_ARCH) += $(v8_local_src_files_$(TARGET_ARCH))
 
-LOCAL_C_INCLUDES += \
-	$(LOCAL_PATH)/src \
-	external/icu/icu4c/source/common \
-	external/icu/icu4c/source/i18n
+LOCAL_SHARED_LIBRARIES += libicuuc libicui18n
+
+LOCAL_C_INCLUDES += $(LOCAL_PATH)/src
 
 LOCAL_MODULE_TARGET_ARCH_WARN := $(V8_SUPPORTED_ARCH)
 
diff --git a/Android.mksnapshot.mk b/Android.mksnapshot.mk
index 200f6d9..c38a0cd 100644
--- a/Android.mksnapshot.mk
+++ b/Android.mksnapshot.mk
@@ -110,10 +110,7 @@
 LOCAL_SRC_FILES += $(v8_local_src_files_$(mksnapshot_arch))
 LOCAL_CFLAGS += $(LOCAL_CFLAGS_v8_target_$(mksnapshot_arch))
 
-LOCAL_C_INCLUDES := \
-	$(LOCAL_PATH)/src \
-	external/icu/icu4c/source/common \
-	external/icu/icu4c/source/i18n
+LOCAL_C_INCLUDES += $(LOCAL_PATH)/src
 
 # This is on host.
 LOCAL_LDLIBS := -lpthread
diff --git a/CleanSpec.mk b/CleanSpec.mk
index 1c13995..a136b34 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -76,6 +76,10 @@
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/STATIC_LIBRARIES/libv8_intermediates)
 $(call add-clean-step, rm -rf $(OUT_DIR)/host/$(HOST_OS)-$(HOST_ARCH)/bin/mksnapshot)
 $(call add-clean-step, rm -rf $(OUT_DIR)/host/$(HOST_OS)-$(HOST_ARCH)/obj/EXECUTABLES/mksnapshot_intermediates)
+
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/STATIC_LIBRARIES/libv8_intermediates)
+$(call add-clean-step, rm -rf $(OUT_DIR)/host/$(HOST_OS)-$(HOST_ARCH)/bin/mksnapshot)
+$(call add-clean-step, rm -rf $(OUT_DIR)/host/$(HOST_OS)-$(HOST_ARCH)/obj/EXECUTABLES/mksnapshot_intermediates)
 # ************************************************
 # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
 # ************************************************