fold SK_CPU_HAS_CONDITION_INSTR through as always defined

src/core/SkMath.cpp

Index: src/core/SkMath.cpp
diff --git a/src/core/SkMath.cpp b/src/core/SkMath.cpp
index 0efedd727b08d87562fd9105422b3e14da39d533..2693e5c13c15389fb2de10e75c52bc316e7259b5 100644
--- a/src/core/SkMath.cpp
+++ b/src/core/SkMath.cpp
@@ -27,7 +27,6 @@ int SkCLZ_portable(uint32_t x) {
         return 32;
     }
 
-#ifdef SK_CPU_HAS_CONDITIONAL_INSTR
     int zeros = 31;
     if (x & 0xFFFF0000) {
         sub_shift(zeros, x, 16);
@@ -44,24 +43,6 @@ int SkCLZ_portable(uint32_t x) {
     if (x & 0x2) {
         sub_shift(zeros, x, 1);
     }
-#else
-    int zeros = ((x >> 16) - 1) >> 31 << 4;
-    x <<= zeros;
-
-    int nonzero = ((x >> 24) - 1) >> 31 << 3;
-    zeros += nonzero;
-    x <<= nonzero;
-
-    nonzero = ((x >> 28) - 1) >> 31 << 2;
-    zeros += nonzero;
-    x <<= nonzero;
-
-    nonzero = ((x >> 30) - 1) >> 31 << 1;
-    zeros += nonzero;
-    x <<= nonzero;
-
-    zeros += (~x) >> 31;
-#endif
 
     return zeros;
 }