Snap for 4778776 from 83f0dac26f82afd9743f314902517c07c482489d to pi-release

Change-Id: I6b026442cdb40b7e20e629a0e5ba95723205fac5
diff --git a/Android.mk b/Android.mk
index 760c4c8..4e5bbf5 100644
--- a/Android.mk
+++ b/Android.mk
@@ -85,6 +85,7 @@
 LOCAL_STATIC_LIBRARIES += flatbuffers
 
 LOCAL_REQUIRED_MODULES := textclassifier.en.model
+LOCAL_REQUIRED_MODULES += textclassifier.universal.model
 
 LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/jni.lds
 LOCAL_LDFLAGS += -Wl,-version-script=$(LOCAL_PATH)/jni.lds
@@ -141,6 +142,14 @@
 LOCAL_MODULE_PATH   := $(TARGET_OUT_ETC)/textclassifier
 include $(BUILD_PREBUILT)
 
+include $(CLEAR_VARS)
+LOCAL_MODULE        := textclassifier.universal.model
+LOCAL_MODULE_CLASS  := ETC
+LOCAL_MODULE_OWNER  := google
+LOCAL_SRC_FILES     := ./models/textclassifier.universal.model
+LOCAL_MODULE_PATH   := $(TARGET_OUT_ETC)/textclassifier
+include $(BUILD_PREBUILT)
+
 # -----------------------
 # Smart Selection bundles
 # -----------------------