Clean up EGL thread state at thread exit in nanobench and DM

bench/nanobench.cpp

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include <ctype.h>
 
 #include "nanobench.h"
@@ skipping 1002 matching lines @@
         }
     };
     static SkThread* intentionallyLeaked = new SkThread(Loop::forever);
     intentionallyLeaked->start();
 }
 
 int nanobench_main();
 int nanobench_main() {
     SetupCrashHandler();
     SkAutoGraphics ag;
+#if SK_SUPPORT_GPU
+    SkTaskGroup::Enabler enabled(FLAGS_threads, GrContextFactory::ReleaseGpuAPIsInThread);
+#else
     SkTaskGroup::Enabler enabled(FLAGS_threads);
+#endif
 
 #if SK_SUPPORT_GPU
     GrContextOptions grContextOpts;
     grContextOpts.fDrawPathToCompressedTexture = FLAGS_gpuCompressAlphaMasks;
     gGrFactory.reset(new GrContextFactory(grContextOpts));
 #endif
 
     if (FLAGS_veryVerbose) {
         FLAGS_verbose = true;
     }
@@ skipping 231 matching lines @@
 
     log->bench("memory_usage", 0,0);
     log->config("meta");
     log->metric("max_rss_mb", sk_tools::getMaxResidentSetSizeMB());
 
 #if SK_SUPPORT_GPU
     // Make sure we clean up the global GrContextFactory here, otherwise we might race with the
     // SkEventTracer destructor
     gGrFactory.reset(nullptr);
 #endif
-
+#if SK_SUPPORT_GPU
+    // The main thread maybe ran GPU code.
+    GrContextFactory::ReleaseGpuAPIsInThread();
+#endif
     return 0;
 }
 
 #if !defined SK_BUILD_FOR_IOS
 int main(int argc, char** argv) {
     SkCommandLineFlags::Parse(argc, argv);
     return nanobench_main();
 }
 #endif