make compare_rendered_pictures process render_pictures's new JSON output format

gm/rebaseline_server/testdata/outputs/expected/compare_rendered_pictures_test.CompareRenderedPicturesTest.test_endToEnd/compare_rendered_pictures.json

Index: gm/rebaseline_server/testdata/outputs/expected/compare_rendered_pictures_test.CompareRenderedPicturesTest.test_endToEnd/compare_rendered_pictures.json
diff --git a/gm/rebaseline_server/testdata/outputs/expected/compare_rendered_pictures_test.CompareRenderedPicturesTest.test_endToEnd/compare_rendered_pictures.json b/gm/rebaseline_server/testdata/outputs/expected/compare_rendered_pictures_test.CompareRenderedPicturesTest.test_endToEnd/compare_rendered_pictures.json
index c60c7873f90d1ac615effd55a75c94b2864331cc..7a0c912c43514179360bfb34e8201e7dc2fe9a43 100644
--- a/gm/rebaseline_server/testdata/outputs/expected/compare_rendered_pictures_test.CompareRenderedPicturesTest.test_endToEnd/compare_rendered_pictures.json
+++ b/gm/rebaseline_server/testdata/outputs/expected/compare_rendered_pictures_test.CompareRenderedPicturesTest.test_endToEnd/compare_rendered_pictures.json
@@ -5,7 +5,7 @@
       "isFilterable": true, 
       "isSortable": true, 
       "valuesAndCounts": {
-        "builder1": 2
+        "TODO": 3
       }
     }, 
     "config": {
@@ -13,7 +13,7 @@
       "isFilterable": true, 
       "isSortable": true, 
       "valuesAndCounts": {
-        "TODO": 2
+        "whole-image": 3
       }
     }, 
     "resultType": {
@@ -22,7 +22,7 @@
       "isSortable": true, 
       "valuesAndCounts": {
         "failed": 1, 
-        "no-comparison": 0, 
+        "no-comparison": 1, 
         "succeeded": 1
       }
     }, 
@@ -31,13 +31,14 @@
       "isFilterable": true, 
       "isSortable": true, 
       "valuesAndCounts": {
-        "changed.png": 1, 
-        "unchanged.png": 1
+        "changed.skp": 1, 
+        "only-in-before.skp": 1, 
+        "unchanged.skp": 1
       }
     }
   }, 
   "header": {
-    "dataHash": "3972200251153667246", 
+    "dataHash": "182723807383859624", 
     "isEditable": false, 
     "isExported": true, 
     "schemaVersion": 2, 
@@ -48,24 +49,35 @@
   "imagePairs": [
     {
       "extraColumns": {
-        "builder": "builder1", 
-        "config": "TODO", 
+        "builder": "TODO", 
+        "config": "whole-image", 
         "resultType": "failed", 
-        "test": "changed.png"
+        "test": "changed.skp"
       }, 
-      "imageAUrl": "bitmap-64bitMD5/changed_png/8891695120562235492.png", 
-      "imageBUrl": "bitmap-64bitMD5/changed_png/2520753504544298264.png", 
+      "imageAUrl": "bitmap-64bitMD5_8891695120562235492.png", 
+      "imageBUrl": "bitmap-64bitMD5_2520753504544298264.png", 
       "isDifferent": true
     }, 
     {
       "extraColumns": {
-        "builder": "builder1", 
-        "config": "TODO", 
+        "builder": "TODO", 
+        "config": "whole-image", 
+        "resultType": "no-comparison", 
+        "test": "only-in-before.skp"
+      }, 
+      "imageAUrl": "bitmap-64bitMD5_8891695120562235492.png", 
+      "imageBUrl": null, 
+      "isDifferent": true
+    }, 
+    {
+      "extraColumns": {
+        "builder": "TODO", 
+        "config": "whole-image", 
         "resultType": "succeeded", 
-        "test": "unchanged.png"
+        "test": "unchanged.skp"
       }, 
-      "imageAUrl": "bitmap-64bitMD5/unchanged_png/11092453015575919668.png", 
-      "imageBUrl": "bitmap-64bitMD5/unchanged_png/11092453015575919668.png", 
+      "imageAUrl": "bitmap-64bitMD5_11092453015575919668.png", 
+      "imageBUrl": "bitmap-64bitMD5_11092453015575919668.png", 
       "isDifferent": false
     }
   ],