Improve emoji detection and support

Change-Id: Ie245920a51d64e934522a26eb378d350d69f5a98
5 files changed