Revert of skpbench: add option for gpu timing

tools/gpu/FenceSync.h

Index: tools/gpu/FenceSync.h
diff --git a/tools/gpu/FenceSync.h b/tools/gpu/FenceSync.h
index 90ef1daec73ddc1f28bf3681e74d732081fe5416..c3f1182621e08bd07bfdb18ca54f735d3d5899e3 100644
--- a/tools/gpu/FenceSync.h
+++ b/tools/gpu/FenceSync.h
@@ -13,7 +13,7 @@
 namespace sk_gpu_test {
 
 using PlatformFence = intptr_t;
-static constexpr PlatformFence kInvalidFence = 0;
+static constexpr PlatformFence kInvalidPlatformFence = 0;
 
 /*
  * This class provides an interface to interact with fence syncs. A fence sync is an object that the
@@ -29,6 +29,6 @@
     virtual ~FenceSync() {}
 };
 
-}  // namespace sk_gpu_test
+}
 
 #endif