Merge "Update Emoji.java to use ICU"