Revert of Make SkGraphics::Term a no-op, stop calling it.

include/core/SkGraphics.h

 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkGraphics_DEFINED
 #define SkGraphics_DEFINED
 
 #include "SkTypes.h"
 
 class SkData;
 class SkImageGenerator;
 class SkTraceMemoryDump;
 
 class SK_API SkGraphics {
 public:
     /**
      *  Call this at process initialization time if your environment does not
      *  permit static global initializers that execute code.
      *  Init() is thread-safe and idempotent.
      */
     static void Init();
 
-    SK_ATTR_DEPRECATED("SkGraphics::Term() is a no-op.  We're in the middle of cleaning it up.")
-    static void Term() {}
+    /**
+     *  Call this to release any memory held privately, such as the font cache.
+     */
+    static void Term();
 
     /**
      *  Return the version numbers for the library. If the parameter is not
      *  null, it is set to the version number.
      */
     static void GetVersion(int32_t* major, int32_t* minor, int32_t* patch);
 
     /**
      *  Return the max number of bytes that should be used by the font cache.
      *  If the cache needs to allocate more, it will purge previous entries.
@@ skipping 122 matching lines @@
      */
     static ImageGeneratorFromEncodedFactory
            SetImageGeneratorFromEncodedFactory(ImageGeneratorFromEncodedFactory);
 };
 
 class SkAutoGraphics {
 public:
     SkAutoGraphics() {
         SkGraphics::Init();
     }
+    ~SkAutoGraphics() {
+        SkGraphics::Term();
+    }
 };
 
 #endif