Revert of enforce 16byte alignment in shader contexts

src/core/SkDraw.cpp

Index: src/core/SkDraw.cpp
diff --git a/src/core/SkDraw.cpp b/src/core/SkDraw.cpp
index e9b0677c33600031b99cd48460a5bcc63a6295f4..cff4252579b41c89d3eb5148ad7735f5557d38b1 100644
--- a/src/core/SkDraw.cpp
+++ b/src/core/SkDraw.cpp
@@ -1698,6 +1698,8 @@
 public:
     SkTriColorShader() {}
 
+    size_t contextSize(const ContextRec&) const override;
+
     class TriColorShaderContext : public SkShader::Context {
     public:
         TriColorShaderContext(const SkTriColorShader& shader, const ContextRec&);
@@ -1720,7 +1722,6 @@
     Factory getFactory() const override { sk_throw(); return nullptr; }
 
 protected:
-    size_t onContextSize(const ContextRec&) const override;
     Context* onCreateContext(const ContextRec& rec, void* storage) const override {
         return new (storage) TriColorShaderContext(*this, rec);
     }
@@ -1771,10 +1772,9 @@
 
 SkTriColorShader::TriColorShaderContext::~TriColorShaderContext() {}
 
-size_t SkTriColorShader::onContextSize(const ContextRec&) const {
-    return SkAlign16(sizeof(TriColorShaderContext));
-}
-
+size_t SkTriColorShader::contextSize(const ContextRec&) const {
+    return sizeof(TriColorShaderContext);
+}
 void SkTriColorShader::TriColorShaderContext::shadeSpan(int x, int y, SkPMColor dstC[], int count) {
     const int alphaScale = Sk255To256(this->getPaintAlpha());