Merge 2577fca1

Change-Id: Ie2c9f6c2eafb59dff95db8954481ce49c87a6d44
diff --git a/native/jni/Android.mk b/native/jni/Android.mk
index c4adbfa..53bd21d 100644
--- a/native/jni/Android.mk
+++ b/native/jni/Android.mk
@@ -66,7 +66,7 @@
 
 LOCAL_MODULE := libjni_latinime
 
-LOCAL_MODULE_TAGS := user
+LOCAL_MODULE_TAGS := optional
 
 # For STL
 LOCAL_C_INCLUDES += external/stlport/stlport bionic