Merge "Update Emoji.java for emoji 11" into pi-dev