rebaseline.py: if expectations dir contains JSON format results, update those instead of image files

tools/tests/rebaseline/output/using-json1-expectations/output-expected/gm-expectations/base-android-galaxy-nexus/expected-results.json

 {
-   "expected-results" : {
-      "3x3bitmaprect_565.png" : {
-         "allowed-digests" : null,
-         "ignore-failure" : false
-      },
-      "3x3bitmaprect_8888.png" : {
-         "allowed-digests" : null,
-         "ignore-failure" : false
-      },
-      "aaclip_gpu.png" : {
-         "allowed-digests" : [
-            [ "bitmap-64bitMD5", 11899819492385205974 ]
-         ],
-         "ignore-failure" : false
-      },
-      "aarectmodes_565.png" : {
-         "allowed-digests" : [
-            [ "bitmap-64bitMD5", 14760033689012826769 ]
-         ],
-         "ignore-failure" : false
-      },
-      "imageblur_565.png" : {
-         "allowed-digests" : [
-            [ "bitmap-64bitMD5", 17796243856503591523 ]
-         ],
-         "ignore-failure" : false
-      },
-      "imageblur_8888.png" : {
-         "allowed-digests" : [
-            [ "bitmap-64bitMD5", 7426416989687670152 ]
-         ],
-         "ignore-failure" : false
-      },
-      "shadertext3_8888.png" : {
-         "allowed-digests" : [
-            [ "bitmap-64bitMD5", 10593797161686785561 ]
-         ],
-         "ignore-failure" : false
-      },
-      "xfermodeimagefilter_pdf.png" : {
-         "allowed-digests" : null,
-         "ignore-failure" : false
-      },
-      "xfermodes_pdf.png" : {
-         "allowed-digests" : [
-            [ "bitmap-64bitMD5", 9151974350149210736 ]
-         ],
-         "ignore-failure" : false
-      }
-   }
-}
+  "expected-results": {
+    "3x3bitmaprect_565.png": {
+      "allowed-digests": null, 
+      "ignore-failure": false
+    }, 
+    "3x3bitmaprect_8888.png": {
+      "allowed-digests": null, 
+      "ignore-failure": false
+    }, 
+    "aaclip_gpu.png": {
+      "allowed-digests": [
+        [
+          "bitmap-64bitMD5", 
+          11899819492385205974
+        ]
+      ], 
+      "ignore-failure": false
+    }, 
+    "aarectmodes_565.png": {
+      "allowed-digests": [
+        [
+          "bitmap-64bitMD5", 
+          14760033689012826769
+        ]
+      ], 
+      "ignore-failure": false
+    }, 
+    "imageblur_565.png": {
+      "allowed-digests": [
+        [
+          "bitmap-64bitMD5", 
+          3359963596899141322

[epoger, 2013/07/03 20:07:53]

Looking at the actual-results.json files, these are exactly the results I would
expect to be rebaselined...

$ cat
tools/tests/rebaseline/input/json1/base-android-galaxy-nexus/Test-Android-GalaxyNexus-SGX540-Arm7-Debug/base-android-galaxy-nexus/actual-results.json
{
   "actual-results" : {
      "failed" : {
         "imageblur_565.png" : [ "bitmap-64bitMD5", 3359963596899141322 ],
         "imageblur_8888.png" : [ "bitmap-64bitMD5", 4217923806027861152 ],
         "shadertext3_8888.png" : [ "bitmap-64bitMD5", 3713708307125704716 ]
       },
      "failure-ignored" : null,
      "no-comparison" : {
         "3x3bitmaprect_565.png" : [ "bitmap-64bitMD5", 16998423976396106083 ],
         "3x3bitmaprect_8888.png" : [ "bitmap-64bitMD5", 2054956815327187963 ],
         "xfermodeimagefilter_pdf.png" : [ "bitmap-64bitMD5",
16502178848783208088 ]
      },
      "succeeded" : {
         "aaclip_gpu.png" : [ "bitmap-64bitMD5", 11899819492385205974 ],
         "aarectmodes_565.png" : [ "bitmap-64bitMD5", 14760033689012826769 ],
         "xfermodes_pdf.png" : [ "bitmap-64bitMD5", 9151974350149210736 ]
      }
   },
[...]

$ cat
tools/tests/rebaseline/input/json1/base-shuttle-win7-intel-float/Test-Win7-ShuttleA-HD2000-x86-Release/base-shuttle-win7-intel-float/actual-results.json
{
   "actual-results" : {
      "failed" : null,
      "failure-ignored" : null,
      "no-comparison" : {
         "3x3bitmaprect_565.png" : [ "bitmap-64bitMD5", 16998423976396106083 ],
         "3x3bitmaprect_8888.png" : [ "bitmap-64bitMD5", 2054956815327187963 ],
         "xfermodeimagefilter_pdf.png" : [ "bitmap-64bitMD5",
16502178848783208088 ]
      },
[...]

+        ]
+      ], 
+      "ignore-failure": false
+    }, 
+    "imageblur_8888.png": {
+      "allowed-digests": [
+        [
+          "bitmap-64bitMD5", 
+          4217923806027861152
+        ]
+      ], 
+      "ignore-failure": false
+    }, 
+    "shadertext3_8888.png": {
+      "allowed-digests": [
+        [
+          "bitmap-64bitMD5", 
+          3713708307125704716
+        ]
+      ], 
+      "ignore-failure": false
+    }, 
+    "xfermodeimagefilter_pdf.png": {
+      "allowed-digests": null, 
+      "ignore-failure": false
+    }, 
+    "xfermodes_pdf.png": {
+      "allowed-digests": [
+        [
+          "bitmap-64bitMD5", 
+          9151974350149210736
+        ]
+      ], 
+      "ignore-failure": false
+    }
+  }
+}