Rebasing more conic stuff

expectations/gm/Test-Android-Nexus5-Adreno330-Arm7-Debug/expected-results.json

 {
   "expected-results": {
     "3x3bitmaprect_565.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
           16998423976396106083
         ]
       ], 
       "bugs": [
@@ skipping 6666 matching lines @@
           "bitmap-64bitMD5", 
           7042957051470774363
         ]
       ], 
       "reviewed-by-human": true
     }, 
     "image-surface_565.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          12107833635271491463
+          1119097263213437839
         ]
       ], 
       "reviewed-by-human": true
     }, 
     "image-surface_8888.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          15729042135723497470
+          15228210007365166091
         ]
       ], 
       "reviewed-by-human": true
     }, 
     "image-surface_gpu.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          4156569930969940051
+          9892394339618482140
         ]
       ], 
       "reviewed-by-human": true
     }, 
     "imagealphathreshold_565.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
           9262312764539834132
         ]
@@ skipping 240 matching lines @@
           "bitmap-64bitMD5", 
           6514050084756992117
         ]
       ], 
       "reviewed-by-human": true
     }, 
     "imagefiltersscaled_565.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          2337680673667749002
+          11478610349808930329
         ]
       ], 
       "reviewed-by-human": true
     }, 
     "imagefiltersscaled_8888.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          11178354341533563746
+          1680187521143619928
         ]
       ], 
       "reviewed-by-human": true
     }, 
     "imagefiltersscaled_gpu.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
           9276560988368331344
         ]
@@ skipping 168 matching lines @@
           "bitmap-64bitMD5", 
           5275334220458880563
         ]
       ], 
       "reviewed-by-human": true
     }, 
     "lerpmode_565.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          2706716911241639781
+          13723203022293277619
         ]
       ], 
       "reviewed-by-human": true
     }, 
     "lerpmode_8888.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          11952378473714520027
+          16696552045750968339
         ]
       ], 
-      "bugs": [
-        2146
-      ], 
-      "reviewed-by-human": false
+      "reviewed-by-human": true
     }, 
     "lerpmode_gpu.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
           13082188235973868304
         ]
       ], 
       "reviewed-by-human": true
     }, 
@@ skipping 105 matching lines @@
           "bitmap-64bitMD5", 
           17725216555771216881
         ]
       ], 
       "reviewed-by-human": true
     }, 
     "lumafilter_565.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          15243217481506989056
+          10821455119665049305
         ]
       ], 
       "reviewed-by-human": true
     }, 
     "lumafilter_8888.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          17503040133058430346
+          9163619580298631209
         ]
       ], 
       "reviewed-by-human": true
     }, 
     "lumafilter_gpu.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
           6486111073365789800
         ]
@@ skipping 159 matching lines @@
       ], 
       "bugs": [
         3063
       ], 
       "reviewed-by-human": true
     }, 
     "mixed_xfermodes_565.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          1539651103309648647
+          2497210722374347242
         ]
       ], 
-      "bugs": [
-        2146
-      ], 
-      "reviewed-by-human": false
+      "reviewed-by-human": true
     }, 
     "mixed_xfermodes_8888.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          14918941537433499795
+          14275905201463977510
         ]
       ], 
-      "bugs": [
-        2146
-      ], 
-      "reviewed-by-human": false
+      "reviewed-by-human": true
     }, 
     "mixed_xfermodes_gpu.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          4740438102808777911
+          8132408056390887748
         ]
       ], 
       "ignore-failure": true, 
       "reviewed-by-human": true
     }, 
     "modecolorfilters_565.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
           7221526503067974995
@@ skipping 421 matching lines @@
           "bitmap-64bitMD5", 
           15496207471756325148
         ]
       ], 
       "reviewed-by-human": true
     }, 
     "nested_aa_565.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          16123340172201812866
+          10571933706553761352
         ]
       ], 
-      "bugs": [
-        2146
-      ], 
-      "reviewed-by-human": false
+      "reviewed-by-human": true
     }, 
     "nested_aa_8888.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          15356581678046831315
+          13680063892178866685
         ]
       ], 
-      "bugs": [
-        2146
-      ], 
-      "reviewed-by-human": false
+      "reviewed-by-human": true
     }, 
     "nested_aa_gpu.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          17328900826798281383
+          11767849405656054004
         ]
       ], 
       "reviewed-by-human": true
     }, 
     "nested_bw_565.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          1642884649618332584
+          13903459090671434631
         ]
       ], 
-      "bugs": [
-        2146
-      ], 
-      "reviewed-by-human": false
+      "reviewed-by-human": true
     }, 
     "nested_bw_8888.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          2247784507927793592
+          6012955209340030318
         ]
       ], 
-      "bugs": [
-        2146
-      ], 
-      "reviewed-by-human": false
+      "reviewed-by-human": true
     }, 
     "nested_bw_gpu.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
           6638289994984814421
         ]
       ], 
       "bugs": [
         2146
       ], 
       "reviewed-by-human": false
     }, 
     "ninepatch-stretch_565.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          2353651351546903350
+          18202318038505709853
         ]
       ], 
-      "bugs": [
-        2146
-      ], 
-      "reviewed-by-human": false
+      "reviewed-by-human": true
     }, 
     "ninepatch-stretch_8888.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          12454353570070316868
+          10399983904344778831
         ]
       ], 
-      "bugs": [
-        2146
-      ], 
-      "reviewed-by-human": false
+      "reviewed-by-human": true
     }, 
     "ninepatch-stretch_gpu.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          18050122059109328370
+          7517112601457395710
         ]
       ], 
       "reviewed-by-human": true
     }, 
     "nonclosedpaths_565.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
           11279780315114260398
         ]
@@ skipping 2833 matching lines @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
           7121791704213727249
         ]
       ], 
       "reviewed-by-human": true
     }
   }
 }