Merge cherrypicks of [2454758, 2454859, 2454837, 2454965, 2454984, 2455001, 2454760, 2454860, 2454838, 2454899, 2454970, 2455005, 2455027, 2454973, 2455006, 2455061, 2455007, 2454914, 2454987, 2454974] into oc-release Change-Id: Ifcaa78d278f13a303172ca08b8e697a8968998bb

commit: c53d99737f125a86cb66d45147e7d167cbbb7edb [log] [tgz]
author: android-build-team Robot <android-build-team-robot@google.com> Fri Jun 23 20:54:05 2017 +0000
committer: android-build-team Robot <android-build-team-robot@google.com> Fri Jun 23 20:54:05 2017 +0000
tree: 1ed8a1c813b7950106df8e7d83ae4ee8eaeb1f7e
parent: 5d6c550da3f6b1ac2003536fc841e4fab2fb63d6 [diff]
parent: 3f762818e2377154c0cb10a07978201e564f229a [diff]
diff --git a/emoji-compat/font/NotoColorEmojiCompat.ttf b/emoji-compat/font/NotoColorEmojiCompat.ttf
index 428f082..ed6ca1a 100644
--- a/emoji-compat/font/NotoColorEmojiCompat.ttf
+++ b/emoji-compat/font/NotoColorEmojiCompat.ttf
Binary files differ
commit	c53d99737f125a86cb66d45147e7d167cbbb7edb	[log] [tgz]
author	android-build-team Robot <android-build-team-robot@google.com>	Fri Jun 23 20:54:05 2017 +0000
committer	android-build-team Robot <android-build-team-robot@google.com>	Fri Jun 23 20:54:05 2017 +0000
tree	1ed8a1c813b7950106df8e7d83ae4ee8eaeb1f7e
parent	5d6c550da3f6b1ac2003536fc841e4fab2fb63d6 [diff]
parent	3f762818e2377154c0cb10a07978201e564f229a [diff]