Revert of Fix UB function problems for shaders and mask.

src/core/SkBlitter_ARGB32.cpp

Index: src/core/SkBlitter_ARGB32.cpp
diff --git a/src/core/SkBlitter_ARGB32.cpp b/src/core/SkBlitter_ARGB32.cpp
index a00ed86d8e03a0843d1d7a851d68d4153130ab48..e44ad02da57a84aeec90b5c9543a2e988b4285b6 100644
--- a/src/core/SkBlitter_ARGB32.cpp
+++ b/src/core/SkBlitter_ARGB32.cpp
@@ -570,7 +570,7 @@
         SkXfermode* xfer = fXfermode;
         do {
             shaderContext->shadeSpan(x, y, span, width);
-            xfer->xfer32(reinterpret_cast<SkPMColor*>(dstRow), span, width, maskRow);
+            xfer->xfer32((SkPMColor*)dstRow, span, width, maskRow);
             dstRow += dstRB;
             maskRow += maskRB;
             y += 1;
@@ -578,7 +578,7 @@
     } else {
         do {
             shaderContext->shadeSpan(x, y, span, width);
-            proc(reinterpret_cast<SkPMColor*>(dstRow), maskRow, span, width);
+            proc(dstRow, maskRow, span, width);
             dstRow += dstRB;
             maskRow += maskRB;
             y += 1;