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

Change-Id: Ia82f88e1f02166e4f2e8063f0923986a9bde47f8