Merge "Update EmojiCompat font for Unicode 11" am: d20a289eae
am: 55ad6e8d2d

Change-Id: I7f31d845927e5e982eb3563dc1a60e35e52bb8c2