rebase coloremoji

NOTRY=True
TBR=
BUG=skia:

Review URL: https://codereview.chromium.org/822553002

1 files changed, 38 insertions, 38 deletions

diff --git a/expectations/gm/Test-Android-Nexus9-TegraK1-Arm64-Release/expected-results.json b/expectations/gm/Test-Android-Nexus9-TegraK1-Arm64-Release/expected-results.json
index d10e20f2e3..df8c1662a2 100644
--- a/expectations/gm/Test-Android-Nexus9-TegraK1-Arm64-Release/expected-results.json
+++ b/expectations/gm/Test-Android-Nexus9-TegraK1-Arm64-Release/expected-results.json
@@ -463,7 +463,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          8741984205182434161
+          3635090355061860852
         ]
       ], 
       "reviewed-by-human": true
@@ -967,7 +967,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          572947680694775255
+          4153511051209691922
         ]
       ], 
       "reviewed-by-human": true
@@ -1975,7 +1975,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          17679334932066359849
+          902966222892433999
         ]
       ], 
       "reviewed-by-human": true
@@ -1984,7 +1984,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          12394069162616512595
+          3350628547199301898
         ]
       ], 
       "reviewed-by-human": true
@@ -1993,7 +1993,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          14033287432110359129
+          1295510349877347552
         ]
       ], 
       "reviewed-by-human": true
@@ -2002,7 +2002,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          7709203808391963233
+          1573399014215078698
         ]
       ], 
       "reviewed-by-human": true
@@ -2011,7 +2011,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          5855446758856601272
+          6979973240796781510
         ]
       ], 
       "reviewed-by-human": true
@@ -9240,7 +9240,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          18193560542230439034
+          16256784301016817075
         ]
       ], 
       "reviewed-by-human": true
@@ -9249,7 +9249,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          18193560542230439034
+          17073977200699330453
         ]
       ], 
       "reviewed-by-human": true
@@ -9285,7 +9285,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          12179959418977587707
+          14130787934651891193
         ]
       ], 
       "reviewed-by-human": true
@@ -9294,7 +9294,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          12194250515792704596
+          3666037923013378304
         ]
       ], 
       "reviewed-by-human": true
@@ -9330,7 +9330,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          800287182772078752
+          9898614597448068943
         ]
       ], 
       "reviewed-by-human": true
@@ -9339,7 +9339,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          800287182772078752
+          4901736566274607767
         ]
       ], 
       "reviewed-by-human": true
@@ -9375,7 +9375,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          13129553799947034852
+          5781839755001627582
         ]
       ], 
       "reviewed-by-human": true
@@ -9384,7 +9384,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          16178852583024686946
+          1736429994859569971
         ]
       ], 
       "reviewed-by-human": true
@@ -9420,7 +9420,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          933634463399667624
+          8451553745876765051
         ]
       ], 
       "reviewed-by-human": true
@@ -9429,7 +9429,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          933634463399667624
+          8721055330289760189
         ]
       ], 
       "reviewed-by-human": true
@@ -9465,7 +9465,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          1408832925606257752
+          8629438026058080376
         ]
       ], 
       "reviewed-by-human": true
@@ -9474,7 +9474,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          967912435712348466
+          11591971619293808716
         ]
       ], 
       "reviewed-by-human": true
@@ -9510,7 +9510,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          199749176181158638
+          8695877942545638956
         ]
       ], 
       "reviewed-by-human": true
@@ -9519,7 +9519,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          199749176181158638
+          17328267392649673097
         ]
       ], 
       "reviewed-by-human": true
@@ -9555,7 +9555,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          17106614860866261796
+          5220551190456280948
         ]
       ], 
       "reviewed-by-human": true
@@ -9564,7 +9564,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          15333653336489192134
+          248739950164403522
         ]
       ], 
       "reviewed-by-human": true
@@ -9600,7 +9600,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          1710646673657114109
+          6228086427486411934
         ]
       ], 
       "reviewed-by-human": true
@@ -9609,7 +9609,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          1710646673657114109
+          13875579390715514061
         ]
       ], 
       "reviewed-by-human": true
@@ -9645,7 +9645,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          17449676245469592746
+          4626725759395110854
         ]
       ], 
       "reviewed-by-human": true
@@ -9654,7 +9654,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          4607299501982284307
+          14041000438595154164
         ]
       ], 
       "reviewed-by-human": true
@@ -9690,7 +9690,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          442500581142441370
+          1217879579160279083
         ]
       ], 
       "reviewed-by-human": true
@@ -9699,7 +9699,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          10775051844942821884
+          10437789084132385900
         ]
       ], 
       "reviewed-by-human": true
@@ -9735,7 +9735,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          2198657088422913758
+          3195929147921448042
         ]
       ], 
       "reviewed-by-human": true
@@ -9744,7 +9744,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          15182653485423465349
+          1274191328140857196
         ]
       ], 
       "reviewed-by-human": true
@@ -9771,7 +9771,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          5895899203449139966
+          6343009307364501166
         ]
       ], 
       "reviewed-by-human": true
@@ -9780,7 +9780,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          12392219053649938509
+          3282047406108243170
         ]
       ], 
       "reviewed-by-human": true
@@ -9789,7 +9789,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          4602298068323642350
+          10346145283076853286
         ]
       ], 
       "reviewed-by-human": true
@@ -9816,7 +9816,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          13186588997955809762
+          14463107420821770322
         ]
       ], 
       "reviewed-by-human": true
@@ -9825,7 +9825,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          7761704053050686006
+          11206023573872212573
         ]
       ], 
       "reviewed-by-human": true
@@ -9834,7 +9834,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          10694415267640185043
+          7656015811495630354
         ]
       ], 
       "reviewed-by-human": true
@@ -10979,7 +10979,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          11755908426825216741
+          12857581953533985773
         ]
       ], 
       "reviewed-by-human": true