Move to the unadulterated icu data.

Bug: 10292865

(cherry picked from commit 3760df17ed3293e3c58b03e560abdc012034f8ad)

Change-Id: I28f1986c7bd4e8d6046635880d9ca2def6a62f19
diff --git a/stubdata/Android.mk b/stubdata/Android.mk
index 81dd562..5beeeda 100644
--- a/stubdata/Android.mk
+++ b/stubdata/Android.mk
@@ -22,19 +22,21 @@
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := icu-data
+LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.mk
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_CLASS := ETC
 LOCAL_MODULE_PATH := $(TARGET_OUT)/usr/icu
 LOCAL_MODULE_STEM := $(root).dat
-LOCAL_SRC_FILES := $(root)-default.dat
+LOCAL_SRC_FILES := $(root)-all.dat
 include $(BUILD_PREBUILT)
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := icu-data-host
+LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.mk
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_CLASS := ETC
 LOCAL_MODULE_PATH := $(HOST_OUT)/usr/icu
 LOCAL_MODULE_STEM := $(root).dat
-LOCAL_SRC_FILES := $(root)-default.dat
+LOCAL_SRC_FILES := $(root)-all.dat
 LOCAL_IS_HOST_MODULE := true
 include $(BUILD_PREBUILT)