rebase gms and update ignore

expectations/gm/Test-Android-Nexus7-Tegra3-Arm7-Debug/expected-results.json

 {
   "actual-results": {
     "failed": null, 
     "failure-ignored": null, 
     "no-comparison": null, 
     "succeeded": null
   }, 
   "expected-results": {
     "3x3bitmaprect_565.png": {
       "allowed-digests": [
@@ skipping 6139 matching lines @@
           "bitmap-64bitMD5", 
           4408059671304210250
         ]
       ], 
       "reviewed-by-human": true
     }, 
     "hairlines_gpu.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
-          15676831208311271003
+          144744244157580095
         ]
       ], 
       "reviewed-by-human": true
     }, 
     "hairmodes_565.png": {
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
           16129121813435312029
         ]
@@ skipping 4248 matching lines @@
       "allowed-digests": [
         [
           "bitmap-64bitMD5", 
           16415218204576550093
         ]
       ], 
       "reviewed-by-human": true
     }
   }
 }