Revert of enforce 16byte alignment in shader contexts

src/core/SkColorFilterShader.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 SkColorFilterShader_DEFINED
 #define SkColorFilterShader_DEFINED
 
 #include "SkColorFilter.h"
 #include "SkShader.h"
 
 class SkColorFilterShader : public SkShader {
 public:
     SkColorFilterShader(SkShader* shader, SkColorFilter* filter);
-
+    
+    size_t contextSize(const ContextRec&) const override;
+    
 #if SK_SUPPORT_GPU
     const GrFragmentProcessor* asFragmentProcessor(GrContext*,
                                                    const SkMatrix& viewM,
                                                    const SkMatrix* localMatrix,
                                                    SkFilterQuality) const override;
 #endif
 
     class FilterShaderContext : public SkShader::Context {
     public:
         // Takes ownership of shaderContext and calls its destructor.
@@ skipping 14 matching lines @@
         SkShader::Context* fShaderContext;
         
         typedef SkShader::Context INHERITED;
     };
     
     SK_TO_STRING_OVERRIDE()
     SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkColorFilterShader)
     
 protected:
     void flatten(SkWriteBuffer&) const override;
-    size_t onContextSize(const ContextRec&) const override;
     Context* onCreateContext(const ContextRec&, void* storage) const override;
     
+    
 private:
     SkAutoTUnref<SkShader>      fShader;
     SkAutoTUnref<SkColorFilter> fFilter;
     
     typedef SkShader INHERITED;
 };
 
 #endif