Change the name of SkFlags to SkCommandLineFlags.

gm/gmmain.cpp

Index: gm/gmmain.cpp
diff --git a/gm/gmmain.cpp b/gm/gmmain.cpp
index 9effb25a61ddf5daf69d2e301f01300fb410f34e..9f2b5034cf1fd1263099d0ac74c95baa306c168d 100644
--- a/gm/gmmain.cpp
+++ b/gm/gmmain.cpp
@@ -19,11 +19,11 @@
 #include "SkBitmap.h"
 #include "SkBitmapChecksummer.h"
 #include "SkColorPriv.h"
+#include "SkCommandLineFlags.h"
 #include "SkData.h"
 #include "SkDeferredCanvas.h"
 #include "SkDevice.h"
 #include "SkDrawFilter.h"
-#include "SkFlags.h"
 #include "SkGPipe.h"
 #include "SkGraphics.h"
 #include "SkImageDecoder.h"
@@ -1162,8 +1162,8 @@ int tool_main(int argc, char** argv) {
 
     SkString usage;
     usage.printf("Run the golden master tests.\n");
-    SkFlags::SetUsage(usage.c_str());
-    SkFlags::ParseCommandLine(argc, argv);
+    SkCommandLineFlags::SetUsage(usage.c_str());
+    SkCommandLineFlags::ParseCommandLine(argc, argv);
 
 #if SK_SUPPORT_GPU
     struct {