Move SkOpts.h back to src/core.

include/private/SkOpts.h

Index: include/private/SkOpts.h
diff --git a/include/private/SkOpts.h b/include/private/SkOpts.h
deleted file mode 100644
index 9239f8efec9dfe20c8dca5f64fc4d8d5e59e95af..0000000000000000000000000000000000000000
--- a/include/private/SkOpts.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright 2015 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef SkOpts_DEFINED
-#define SkOpts_DEFINED
-
-#include "SkTypes.h"
-#include "SkXfermode.h"
-
-struct ProcCoeff;
-
-namespace SkOpts {
-    // Call to replace pointers to portable functions with pointers to CPU-specific functions.
-    // Thread-safe and idempotent.
-    // Called by SkGraphics::Init(), and automatically #if SK_ALLOW_STATIC_GLOBAL_INITIALIZERS.
-    void Init();
-
-    // Declare function pointers here...
-
-    // Returns a fast approximation of 1.0f/sqrtf(x).
-    extern float (*rsqrt)(float);
-
-    // See SkUtils.h
-    extern void (*memset16)(uint16_t[], uint16_t, int);
-    extern void (*memset32)(uint32_t[], uint32_t, int);
-
-    // May return nullptr if we haven't specialized the given Mode.
-    extern SkXfermode* (*create_xfermode)(const ProcCoeff&, SkXfermode::Mode);
-}
-
-#endif//SkOpts_DEFINED