Merge "Add many more emoji tests" into nyc-dev
am: a51a12c

* commit 'a51a12cfe73c3f578a013543fddd9d913b46c143':
  Add many more emoji tests

Change-Id: I07fdc9040cec1a6be7fe7fa09fb56b6ea724e8d1