Roll external/skia 3ff2b2005..96aa535b7 (16 commits)

https://skia.googlesource.com/skia.git/+log/3ff2b2005..96aa535b7

2018-06-19 benjaminwagner@google.com Remove .bat and .exe from commands where possible.
2018-06-19 caryclark@skia.org fix op fuzz timeout
2018-06-19 angle-skia-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com Roll third_party/externals/angle2 2dabb4a367c3..7df52383cfdf (1 commits)
2018-06-19 fmalita@chromium.org Use SkJSONWriter for viewer UI serialization
2018-06-19 caryclark@skia.org fix bookmaker files
2018-06-19 caryclark@skia.org fix fuzzer bugs in pathops
2018-06-19 kjlubick@google.com Revert "added GrSkSLFP and converted DitherEffect to use it"
2018-06-19 fmalita@chromium.org [skjson] More short string micro-optimizations
2018-06-19 reed@google.com add new source list in prep for separating imagefilters from other effects
2018-06-19 angle-skia-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com Roll third_party/externals/angle2 f6fd48fd329f..2dabb4a367c3 (7 commits)
2018-06-19 swiftshader-skia-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com Roll third_party/externals/swiftshader 700a1a67d569..1fa206780108 (1 commits)
2018-06-19 bungeman@google.com Stop using SkTSwap.
2018-06-19 herb@google.com Remove unused drawText code
2018-06-19 mtklein@google.com Revert "Change how vertex/instance attributes are handled in geometry processors."
2018-06-18 brianosman@google.com Reland "Remove old references to SampleApp"
2018-06-18 borenet@google.com [infra] Include cpython CIPD package on Windows

The AutoRoll server is located here: https://android-roll.skia.org

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+/master/autoroll/README.md

If the roll is causing failures, please contact the current sheriff, who should
be CC'd on the roll, and stop the roller if necessary.

Test: Presubmit checks will test this change.
Change-Id: I5bf7bdc322959049693a33e02f33d38a6551bcc5
Exempt-From-Owner-Approval: The autoroll bot does not require owner approval.
diff --git a/Android.bp b/Android.bp
index ff4d5f0..b590c09 100644
--- a/Android.bp
+++ b/Android.bp
@@ -526,6 +526,7 @@
         "src/gpu/effects/GrCustomXfermode.cpp",
         "src/gpu/effects/GrDisableColorXP.cpp",
         "src/gpu/effects/GrDistanceFieldGeoProc.cpp",
+        "src/gpu/effects/GrDitherEffect.cpp",
         "src/gpu/effects/GrEllipseEffect.cpp",
         "src/gpu/effects/GrGaussianConvolutionFragmentProcessor.cpp",
         "src/gpu/effects/GrLumaColorFilterEffect.cpp",
@@ -541,7 +542,6 @@
         "src/gpu/effects/GrSRGBEffect.cpp",
         "src/gpu/effects/GrShadowGeoProc.cpp",
         "src/gpu/effects/GrSimpleTextureEffect.cpp",
-        "src/gpu/effects/GrSkSLFP.cpp",
         "src/gpu/effects/GrTextureDomain.cpp",
         "src/gpu/effects/GrTextureStripAtlas.cpp",
         "src/gpu/effects/GrUnpremulInputFragmentProcessor.cpp",
@@ -785,7 +785,6 @@
         "src/sksl/SkSLLexer.cpp",
         "src/sksl/SkSLMetalCodeGenerator.cpp",
         "src/sksl/SkSLParser.cpp",
-        "src/sksl/SkSLPipelineStageCodeGenerator.cpp",
         "src/sksl/SkSLSPIRVCodeGenerator.cpp",
         "src/sksl/SkSLString.cpp",
         "src/sksl/SkSLUtil.cpp",