Forward port Emoji and Strip unicode support

Patchset 1 : Fixed tabs

Change-Id: I6adb081d45389adef825d8bb1e431174a4ca416f

Conflicts:
	res/xml/preferences.xml
Revert "Forward port Emoji and Strip unicode support"

This reverts commit 13983e5fc8522fb1030d6d56088cc4c8104527a8.
Forward port Emoji and Strip unicode support

Patchset 1 : Fixed tabs

Change-Id: I6adb081d45389adef825d8bb1e431174a4ca416f

Conflicts:
	res/xml/preferences.xml