Merge "Possible leak in android_emoji_EmojiFactory_newInstance"