Revert of Make nanobench and dm be usable from Chromium build

bench/nanobench.cpp

Index: bench/nanobench.cpp
diff --git a/bench/nanobench.cpp b/bench/nanobench.cpp
index baa109ede74d344e9728ab7089a1b2e07401317b..1f5ae60f822ab9d28b84c37b37465398544616b5 100644
--- a/bench/nanobench.cpp
+++ b/bench/nanobench.cpp
@@ -572,7 +572,9 @@
     int fCurrentSKP;
 };
 
+int nanobench_main();
 int nanobench_main() {
+    SetupCrashHandler();
     SkAutoGraphics ag;
 
 #if SK_SUPPORT_GPU
@@ -750,3 +752,9 @@
     return 0;
 }
 
+#if !defined SK_BUILD_FOR_IOS
+int main(int argc, char** argv) {
+    SkCommandLineFlags::Parse(argc, argv);
+    return nanobench_main();
+}
+#endif