Android S Beta 3
Merge "Sync emojicompat changes to aosp-master"