Merge \"Treat U+2695, U+2640, U+2642 as emoji characters.\" into nyc-mr1-dev
am: c0ab2e83ac

Change-Id: Iaa4d63c425f5d263d322d463c320312890588aaf