Merge donut into master
tree: 55da568552ccdcea14932d9d760c65528b36550f
  1. Android.mk
  2. EmojiFactory.cpp
  3. EmojiFactory.h