Re-enable disabled emoji tests [DO NOT MERGE] am: 8cd1b1ba80 am: 1062853800
am: f238f6a186  -s ours

Change-Id: Ibc74c1f197994e8f9dc7a06d5d15ed3819f6afa4