Clean up hyper-local SkCpu feature test experiment.

src/core/SkCpu.h

 /*
  * Copyright 2016 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkCpu_DEFINED
 #define SkCpu_DEFINED
 
@@ skipping 14 matching lines @@
     };
     enum {
         NEON     = 1 << 0,
         NEON_FMA = 1 << 1,
         VFP_FP16 = 1 << 2,
     };
 
     static void CacheRuntimeFeatures();
     static bool Supports(uint32_t);
 private:
-#if defined(_MSC_VER) || !defined(SkCpu_IMPL)
-    static const uint32_t gCachedFeatures;
-#else
-    static       uint32_t gCachedFeatures;
-#endif
+    static uint32_t gCachedFeatures;
 };
 
 inline bool SkCpu::Supports(uint32_t mask) {
     uint32_t features = gCachedFeatures;
 
     // If we mask in compile-time known lower limits, the compiler can
     // often compile away this entire function.
 #if SK_CPU_X86
     #if SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SSE1
     features |= SSE1;
@@ skipping 31 matching lines @@
 
     #if defined(SK_CPU_ARM64)
     features |= NEON|NEON_FMA|VFP_FP16;
     #endif
 
 #endif
     return (features & mask) == mask;
 }
 
 #endif//SkCpu_DEFINED