Upstream internal changes to emoji-compat from internal master.

Test: ./gradlew assembleDebug in support library now works
Change-Id: I9296d3c86b047681efc18efa5bf03be2452a131d
8 files changed