Snap for 4579913 from 8a66b310b50c7fdd00c7b3fd92d892351c5dbbcf to pi-release

Change-Id: I8016e04cfa3440c6046c792171a057e7f3e0a829
diff --git a/Android.mk b/Android.mk
index 3bcb3bd..88aad2b 100644
--- a/Android.mk
+++ b/Android.mk
@@ -76,7 +76,7 @@
 LOCAL_SHARED_LIBRARIES += libicuuc libicui18n
 LOCAL_SHARED_LIBRARIES += libtflite
 LOCAL_STATIC_LIBRARIES += flatbuffers
-LOCAL_REQUIRED_MODULES := textclassifier.smartselection.en.model
+LOCAL_REQUIRED_MODULES := textclassifier.en.model
 
 LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/jni.lds
 LOCAL_LDFLAGS += -Wl,-version-script=$(LOCAL_PATH)/jni.lds
@@ -117,10 +117,10 @@
 # ----------------------
 
 include $(CLEAR_VARS)
-LOCAL_MODULE        := textclassifier.smartselection.en.model
+LOCAL_MODULE        := textclassifier.en.model
 LOCAL_MODULE_CLASS  := ETC
 LOCAL_MODULE_OWNER  := google
-LOCAL_SRC_FILES     := ./models/textclassifier.smartselection.en.model
+LOCAL_SRC_FILES     := ./models/textclassifier.en.model
 LOCAL_MODULE_PATH   := $(TARGET_OUT_ETC)/textclassifier
 include $(BUILD_PREBUILT)
 
@@ -129,7 +129,7 @@
 # -----------------------
 
 include $(CLEAR_VARS)
-LOCAL_MODULE           := textclassifier.smartselection.bundle1
-LOCAL_REQUIRED_MODULES := textclassifier.smartselection.en.model
+LOCAL_MODULE           := textclassifier.bundle1
+LOCAL_REQUIRED_MODULES := textclassifier.en.model
 LOCAL_CFLAGS := $(MY_LIBTEXTCLASSIFIER_WARNING_CFLAGS)
 include $(BUILD_STATIC_LIBRARY)
diff --git a/models/textclassifier.smartselection.en.model b/models/textclassifier.en.model
similarity index 100%
rename from models/textclassifier.smartselection.en.model
rename to models/textclassifier.en.model
Binary files differ