Rebasing more conic stuff

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

Index: expectations/gm/Test-Android-Nexus5-Adreno330-Arm7-Debug/expected-results.json
diff --git a/expectations/gm/Test-Android-Nexus5-Adreno330-Arm7-Debug/expected-results.json b/expectations/gm/Test-Android-Nexus5-Adreno330-Arm7-Debug/expected-results.json
index 3431b69ffdc4b981304ed77c66f353a48ef6822e..8a33ba701241c921ae6c6270d926fb3fcaec6938 100644
--- a/expectations/gm/Test-Android-Nexus5-Adreno330-Arm7-Debug/expected-results.json
+++ b/expectations/gm/Test-Android-Nexus5-Adreno330-Arm7-Debug/expected-results.json
@@ -6684,7 +6684,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          12107833635271491463
+          1119097263213437839
         ]
       ], 
       "reviewed-by-human": true
@@ -6693,7 +6693,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          15729042135723497470
+          15228210007365166091
         ]
       ], 
       "reviewed-by-human": true
@@ -6702,7 +6702,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          4156569930969940051
+          9892394339618482140
         ]
       ], 
       "reviewed-by-human": true
@@ -6963,7 +6963,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          2337680673667749002
+          11478610349808930329
         ]
       ], 
       "reviewed-by-human": true
@@ -6972,7 +6972,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          11178354341533563746
+          1680187521143619928
         ]
       ], 
       "reviewed-by-human": true
@@ -7161,7 +7161,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          2706716911241639781
+          13723203022293277619
         ]
       ], 
       "reviewed-by-human": true
@@ -7170,13 +7170,10 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          11952378473714520027
+          16696552045750968339
         ]
       ], 
-      "bugs": [
-        2146
-      ], 
-      "reviewed-by-human": false
+      "reviewed-by-human": true
     }, 
     "lerpmode_gpu.png": {
       "allowed-digests": [
@@ -7302,7 +7299,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          15243217481506989056
+          10821455119665049305
         ]
       ], 
       "reviewed-by-human": true
@@ -7311,7 +7308,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          17503040133058430346
+          9163619580298631209
         ]
       ], 
       "reviewed-by-human": true
@@ -7491,31 +7488,25 @@
       "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, 
@@ -7957,31 +7948,25 @@
       "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
@@ -7990,25 +7975,19 @@
       "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": [
@@ -8026,31 +8005,25 @@
       "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