SK_CPU_ARM --> SK_CPU_ARM32

include/core/SkMath.h

Index: include/core/SkMath.h
diff --git a/include/core/SkMath.h b/include/core/SkMath.h
index fe968fd1793aa782bcca99e4b24f2e19237aaef0..014f014debb771575af495aad5469498bebbf6cd 100644
--- a/include/core/SkMath.h
+++ b/include/core/SkMath.h
@@ -84,7 +84,7 @@ int SkCLZ_portable(uint32_t);
                 return 32;
             }
         }
-    #elif defined(SK_CPU_ARM) || defined(__GNUC__) || defined(__clang__)
+    #elif defined(SK_CPU_ARM32) || defined(__GNUC__) || defined(__clang__)
         static inline int SkCLZ(uint32_t mask) {
             // __builtin_clz(0) is undefined, so we have to detect that case.
             return mask ? __builtin_clz(mask) : 32;
@@ -209,7 +209,7 @@ static inline U8CPU SkMulDiv255Round(U16CPU a, U16CPU b) {
  */
 template <typename In, typename Out>
 inline void SkTDivMod(In numer, In denom, Out* div, Out* mod) {
-#ifdef SK_CPU_ARM
+#ifdef SK_CPU_ARM32
     // If we wrote this as in the else branch, GCC won't fuse the two into one
     // divmod call, but rather a div call followed by a divmod.  Silly!  This
     // version is just as fast as calling __aeabi_[u]idivmod manually, but with
@@ -223,7 +223,7 @@ inline void SkTDivMod(In numer, In denom, Out* div, Out* mod) {
     // On x86 this will just be a single idiv.
     *div = static_cast<Out>(numer/denom);
     *mod = static_cast<Out>(numer%denom);
-#endif  // SK_CPU_ARM
+#endif
 }
 
 #endif