Update DM JSON format.

Ex. dm --match patch -w bad --key arch x86 gpu nvidia model z620 --properties git_hash abcd build_number 20 ->

{
   "build_number" : "20",
   "git_hash" : "abcd",
   "key" : {
      "arch" : "x86",
      "gpu" : "nvidia",
      "model" : "z620"
   },
   "results" : [
      {
         "key" : {
            "config" : "565",
            "name" : "ninepatch-stretch"
         },
         "md5" : "f78cfafcbabaf815f3dfcf61fb59acc7",
         "options" : {
            "source_type" : "GM"
         }
      },
      {
         "key" : {
            "config" : "8888",
            "name" : "ninepatch-stretch"
         },
         "md5" : "3e8a42f35a1e76f00caa191e6310d789",
         "options" : {
            "source_type" : "GM"
         }
      },
...

This breaks -r, but that's okay.  Going to follow up this CL with one that removes that entirely.

BUG=skia:
R=stephana@google.com, jcgregorio@google.com, mtklein@google.com

Author: mtklein@chromium.org

Review URL: https://codereview.chromium.org/551873003
diff --git a/tools/flags/SkCommonFlags.cpp b/tools/flags/SkCommonFlags.cpp
index 7776c36..c8cd330 100644
--- a/tools/flags/SkCommonFlags.cpp
+++ b/tools/flags/SkCommonFlags.cpp
@@ -51,3 +51,9 @@
 DEFINE_bool2(veryVerbose, V, false, "tell individual tests to be verbose.");
 
 DEFINE_string2(writePath, w, "", "If set, write bitmaps here as .pngs.");
+
+DEFINE_string(key, "",
+              "Space-separated key/value pairs to add to JSON identifying this builder.");
+DEFINE_string(properties, "",
+              "Space-separated key/value pairs to add to JSON identifying this run.");
+
diff --git a/tools/flags/SkCommonFlags.h b/tools/flags/SkCommonFlags.h
index ecd4148..661501a 100644
--- a/tools/flags/SkCommonFlags.h
+++ b/tools/flags/SkCommonFlags.h
@@ -27,4 +27,7 @@
 DECLARE_bool(veryVerbose);
 DECLARE_string(writePath);
 
+DECLARE_string(key);
+DECLARE_string(properties);
+
 #endif