Remove skia_arch_width, fold into skia_arch_type.

tests/PathOpsSkpClipTest.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "CrashHandler.h"
 // #include "OverwriteLine.h"
 #include "Resources.h"
@@ skipping 1072 matching lines @@
         }
     }
     if (!FLAGS_skp.isEmpty()) {
         gNames.set(FLAGS_skp);
     }
 #ifdef SK_DEBUG
     header.append(" SK_DEBUG");
 #else
     header.append(" SK_RELEASE");
 #endif
-    header.appendf(" skia_arch_width=%d", (int)sizeof(void*) * 8);
     if (FLAGS_verbose) {
         header.appendf("\n");
     }
     SkDebugf("%s", header.c_str());
     Iter iter;
     Test* test;
     while ((test = iter.next()) != NULL) {
         SkAutoTDelete<Test> owned(test);
         if (!SkCommandLineFlags::ShouldSkip(FLAGS_match, test->getName())) {
             test->run();
         }
     }
     SkGraphics::Term();
     return 0;
 }
 
 #if !defined(SK_BUILD_FOR_IOS)
 int main(int argc, char * const argv[]) {
     return tool_main(argc, (char**) argv);
 }
 #endif