Revert of Make GM default to reseting gpu contexts on android.

gm/gmmain.cpp

Index: gm/gmmain.cpp
diff --git a/gm/gmmain.cpp b/gm/gmmain.cpp
index cb7816b6a43e72f84d96483b0810df65b54d1738..94df02ce4d8204f3faee0c8c223f475c5963b3f5 100644
--- a/gm/gmmain.cpp
+++ b/gm/gmmain.cpp
@@ -1466,13 +1466,9 @@
 DEFINE_string2(readPath, r, "", "Read reference images from this dir, and report "
                "any differences between those and the newly generated ones.");
 DEFINE_bool(replay, false, "Exercise the SkPicture replay test pass.");
-
-#ifdef SK_BUILD_FOR_ANDROID
-DEFINE_bool(resetGpuContext, true, "Reset the GrContext prior to running each GM.");
-#else
+#if SK_SUPPORT_GPU
 DEFINE_bool(resetGpuContext, false, "Reset the GrContext prior to running each GM.");
 #endif
-
 DEFINE_bool(rtree, false, "Exercise the R-Tree variant of SkPicture test pass.");
 DEFINE_bool(serialize, false, "Exercise the SkPicture serialization & deserialization test pass.");
 DEFINE_bool(simulatePipePlaybackFailure, false, "Simulate a rendering failure in pipe mode only.");