Fix two leaks & improve leak tracking

include/lazy/SkBitmapFactory.h

Index: include/lazy/SkBitmapFactory.h
===================================================================
--- include/lazy/SkBitmapFactory.h	(revision 9995)
+++ include/lazy/SkBitmapFactory.h	(working copy)
@@ -72,12 +72,16 @@
     class CacheSelector : public SkRefCnt {
 
     public:
+        SK_DECLARE_INST_COUNT(CacheSelector)
         /**
          *  Return an SkImageCache to use based on the provided SkImage::Info. If the caller decides
          *  to hang on to the result, it will call ref, so the implementation should not add a ref
          *  as a result of this call.
          */
         virtual SkImageCache* selectCache(const SkImage::Info&) = 0;
+
+    private:
+        typedef SkRefCnt INHERITED;
     };
 
     /**