Revert of Refactor to put SkXfermode_opts inside SK_OPTS_NS.

src/opts/SkPMFloat_none.h

Index: src/opts/SkPMFloat_none.h
diff --git a/src/opts/SkPMFloat_none.h b/src/opts/SkPMFloat_none.h
index ca98b1ab7e21792f341a52c96d588a076a5d3145..518ad159ff833526bc12cb3fafb66128442a8ef1 100644
--- a/src/opts/SkPMFloat_none.h
+++ b/src/opts/SkPMFloat_none.h
@@ -5,7 +5,9 @@
  * found in the LICENSE file.
  */
 
-SK_ALWAYS_INLINE SkPMFloat::SkPMFloat(SkPMColor c) {
+namespace {  // See SkPMFloat.h
+
+inline SkPMFloat::SkPMFloat(SkPMColor c) {
     float inv255 = 1.0f/255;
     *this = SkPMFloat::FromARGB(SkGetPackedA32(c) * inv255,
                                 SkGetPackedR32(c) * inv255,
@@ -14,7 +16,7 @@
     SkASSERT(this->isValid());
 }
 
-SK_ALWAYS_INLINE SkPMColor SkPMFloat::round() const {
+inline SkPMColor SkPMFloat::round() const {
     float a = this->a(),
           r = this->r(),
           g = this->g(),
@@ -28,6 +30,8 @@
     return c;
 }
 
-SK_ALWAYS_INLINE Sk4f SkPMFloat::alphas() const {
+inline Sk4f SkPMFloat::alphas() const {
     return Sk4f(this->a());
 }
+
+}  // namespace