Merge "Re-enable emoji font tests" into nyc-dev
am: 2159f70

* commit '2159f7017dddaa376dd30786c7e6dcc0ecdf4cfb':
  Re-enable emoji font tests

Change-Id: I0091484be93861086200c01d44c3fb66b814b204