fold SK_CPU_HAS_CONDITION_INSTR through as always defined

include/core/SkPreConfig.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 SkPreConfig_DEFINED
@@ skipping 177 matching lines @@
         #if defined(__thumb2__) && (SK_ARM_ARCH >= 6) \
                 || !defined(__thumb__) && ((SK_ARM_ARCH > 5) || defined(__ARM_ARCH_5E__) \
                 || defined(__ARM_ARCH_5TE__) || defined(__ARM_ARCH_5TEJ__))
             #define SK_ARM_HAS_EDSP
         #endif
     #endif
 #endif
 
 //////////////////////////////////////////////////////////////////////
 
-// TODO(mtklein): propagate this through the codebase and remove
-#define SK_CPU_HAS_CONDITIONAL_INSTR
-
-//////////////////////////////////////////////////////////////////////
-
 #if !defined(SKIA_IMPLEMENTATION)
     #define SKIA_IMPLEMENTATION 0
 #endif
 
 #if defined(SKIA_DLL)
     #if defined(WIN32)
         #if SKIA_IMPLEMENTATION
             #define SK_API __declspec(dllexport)
         #else
             #define SK_API __declspec(dllimport)
@@ skipping 43 matching lines @@
  *
  * NOTE: Clang/ARM (r161757) does not support the 'optimize' attribute.
  */
 #if SK_HAS_ATTRIBUTE(optimize)
 #   define SK_ATTRIBUTE_OPTIMIZE_O1 __attribute__((optimize("O1")))
 #else
 #   define SK_ATTRIBUTE_OPTIMIZE_O1 /* nothing */
 #endif
 
 #endif