rebase GMs

BUG=skia:

Review URL: https://codereview.chromium.org/351973003
diff --git a/expectations/gm/Test-Android-GalaxyNexus-SGX540-Arm7-Debug/expected-results.json b/expectations/gm/Test-Android-GalaxyNexus-SGX540-Arm7-Debug/expected-results.json
index 32ce2b0..792d40b 100644
--- a/expectations/gm/Test-Android-GalaxyNexus-SGX540-Arm7-Debug/expected-results.json
+++ b/expectations/gm/Test-Android-GalaxyNexus-SGX540-Arm7-Debug/expected-results.json
@@ -6085,7 +6085,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          13212710081554198712
+          1275265661982217699
         ]
       ], 
       "reviewed-by-human": true
@@ -6125,7 +6125,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          12639778791110282387
+          7420045945089200912
         ]
       ], 
       "reviewed-by-human": true
diff --git a/expectations/gm/Test-Android-GalaxyNexus-SGX540-Arm7-Release/expected-results.json b/expectations/gm/Test-Android-GalaxyNexus-SGX540-Arm7-Release/expected-results.json
index 0b26a73..9b64133 100644
--- a/expectations/gm/Test-Android-GalaxyNexus-SGX540-Arm7-Release/expected-results.json
+++ b/expectations/gm/Test-Android-GalaxyNexus-SGX540-Arm7-Release/expected-results.json
@@ -6077,7 +6077,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          13212710081554198712
+          1275265661982217699
         ]
       ], 
       "reviewed-by-human": true
@@ -6117,7 +6117,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          12639778791110282387
+          7420045945089200912
         ]
       ], 
       "reviewed-by-human": true
diff --git a/expectations/gm/Test-Android-NexusS-SGX540-Arm7-Debug/expected-results.json b/expectations/gm/Test-Android-NexusS-SGX540-Arm7-Debug/expected-results.json
index 087c840..be826e5 100644
--- a/expectations/gm/Test-Android-NexusS-SGX540-Arm7-Debug/expected-results.json
+++ b/expectations/gm/Test-Android-NexusS-SGX540-Arm7-Debug/expected-results.json
@@ -6092,7 +6092,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          7228395666591593810
+          2682101865426225451
         ]
       ], 
       "reviewed-by-human": true
@@ -6119,7 +6119,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          11967269167893801377
+          1670480655312426736
         ]
       ], 
       "reviewed-by-human": true
diff --git a/expectations/gm/Test-Android-NexusS-SGX540-Arm7-Release/expected-results.json b/expectations/gm/Test-Android-NexusS-SGX540-Arm7-Release/expected-results.json
index 087c840..be826e5 100644
--- a/expectations/gm/Test-Android-NexusS-SGX540-Arm7-Release/expected-results.json
+++ b/expectations/gm/Test-Android-NexusS-SGX540-Arm7-Release/expected-results.json
@@ -6092,7 +6092,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          7228395666591593810
+          2682101865426225451
         ]
       ], 
       "reviewed-by-human": true
@@ -6119,7 +6119,7 @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          11967269167893801377
+          1670480655312426736
         ]
       ], 
       "reviewed-by-human": true