Fold SkTSetBit into SkOTSet*Bit.

include/core/SkTemplates.h

Index: include/core/SkTemplates.h
diff --git a/include/core/SkTemplates.h b/include/core/SkTemplates.h
index 4bcaf3f7b3bd7bd44956f487509e2b1967af864a..a6248f547f38f8008454dca6160e7a5db9f5438f 100644
--- a/include/core/SkTemplates.h
+++ b/include/core/SkTemplates.h
@@ -11,7 +11,6 @@
 #define SkTemplates_DEFINED
 
 #include "SkTypes.h"
-#include <limits>
 #include <limits.h>
 #include <new>
 
@@ -66,15 +65,6 @@ template <typename D, typename S> static D* SkTAddOffset(S* ptr, size_t byteOffs
     );
 }
 
-/** SkTSetBit<N, T>::value is a T with the Nth bit set. */
-template<unsigned N, typename T = uintmax_t> struct SkTSetBit {
-    static const T value = static_cast<T>(1) << N;
-    SK_COMPILE_ASSERT(sizeof(T)*CHAR_BIT > N, SkTSetBit_N_too_large);
-    SK_COMPILE_ASSERT(std::numeric_limits<T>::is_integer, SkTSetBit_T_must_be_integer);
-    SK_COMPILE_ASSERT(!std::numeric_limits<T>::is_signed, SkTSetBit_T_must_be_unsigned);
-    SK_COMPILE_ASSERT(std::numeric_limits<T>::radix == 2, SkTSetBit_T_radix_must_be_2);
-};
-
 /** \class SkAutoTCallVProc
 
     Call a function when this goes out of scope. The template uses two