Don't preserve buggy Android behavior of ignoring the paint's alpha.

src/core/SkComposeShader.cpp

Index: src/core/SkComposeShader.cpp
diff --git a/src/core/SkComposeShader.cpp b/src/core/SkComposeShader.cpp
index 287702ec66fbb76e0ddeb8355e5dae74f969b4cc..d433ff2d435077ced0a3bdff7ec851c62082e54e 100644
--- a/src/core/SkComposeShader.cpp
+++ b/src/core/SkComposeShader.cpp
@@ -137,12 +137,6 @@ void SkComposeShader::ComposeShaderContext::shadeSpan(int x, int y, SkPMColor re
     SkXfermode*        mode = static_cast<const SkComposeShader&>(fShader).fMode;
     unsigned           scale = SkAlpha255To256(this->getPaintAlpha());
 
-#ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK
-    // In the Android framework, make compose shader ignore the paint's alpha.
-    // This matches the old behavior. FIXME: Can we remove this difference?
-    scale = 256;
-#endif
-
     SkPMColor   tmp[TMP_COLOR_COUNT];
 
     if (nullptr == mode) {   // implied SRC_OVER