Merge "Revert "Add description strings for Unicode 8.0 new emoji."" into mnc-dr-dev