am 628231a4: Make libemoji truely optional.

Merge commit '628231a4b4de5ab8866faa912309017759efde0a'

* commit '628231a4b4de5ab8866faa912309017759efde0a':
  Make libemoji truely optional.
tree: 4e48493c6239cdd9b269fbe7a777a53b309843ce
  1. Android.mk
  2. EmojiFactory.cpp
  3. EmojiFactory.h