am 628231a4: Make libemoji truely optional.

Merge commit '628231a4b4de5ab8866faa912309017759efde0a'

* commit '628231a4b4de5ab8866faa912309017759efde0a':
  Make libemoji truely optional.
diff --git a/Android.mk b/Android.mk
index c5a4658..481ee63 100644
--- a/Android.mk
+++ b/Android.mk
@@ -17,6 +17,8 @@
 
 LOCAL_SRC_FILES := EmojiFactory.cpp
 
+LOCAL_MODULE_TAGS := optional
+
 LOCAL_MODULE := libemoji
 
 LOCAL_SHARED_LIBRARIES := \