Move SkOpts.h back to src/core.

include/core/SkUtils.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 SkUtils_DEFINED
 #define SkUtils_DEFINED
 
 #include "SkTypes.h"
-#include "../private/SkOpts.h"
+
+namespace SkOpts {
+    extern void (*memset16)(uint16_t[], uint16_t, int);
+    extern void (*memset32)(uint32_t[], uint32_t, int);
+}
 
 ///////////////////////////////////////////////////////////////////////////////
 
 // The inlining heuristics below were determined using bench/MemsetBench.cpp
 // on a x86 desktop, a Nexus 7 with and without NEON, and a Nexus 9:
 //   - on x86, inlining was never faster,
 //   - on ARMv7, inlining was faster for N<=10.  Putting this check inside the NEON
 //     code was not helpful; it's got to be here outside.
 //   - NEON code generation for ARMv8 with GCC 4.9 is terrible,
 //     making the NEON code ~8x slower that just a serial loop.
@@ skipping 97 matching lines @@
     }
     ~SkAutoTrace() {
         SkDebugf("--- trace: %s Leave\n", fLabel);
     }
 private:
     const char* fLabel;
 };
 #define SkAutoTrace(...) SK_REQUIRE_LOCAL_VAR(SkAutoTrace)
 
 #endif