Roll external/skia 969be1c98..bc721ba4b (6 commits)

https://skia.googlesource.com/skia.git/+log/969be1c98..bc721ba4b

2018-05-21 reed@google.com remove fragile hack in addOval to avoid computing bounds
2018-05-21 herb@google.com Simplify aligment for DFT drawText
2018-05-21 herb@google.com Remove sk_64_isS32 and sk_64_asS32
2018-05-21 kjlubick@google.com Make ASAN setup of Android bots more fault tolerant
2018-05-21 bungeman@google.com IWYU for tests starting with 'D'.
2018-05-21 mtklein@chromium.org Reland "Retry enabling skcms on Android"

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: Ia4fa33c8aaebe120d3562e045f23c8a706e2521b
Exempt-From-Owner-Approval: The autoroll bot does not require owner approval.
diff --git a/Android.bp b/Android.bp
index c00be4d..3bd9347 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1048,6 +1048,7 @@
         "src/xml/",
         "tests/",
         "third_party/gif/",
+        "third_party/skcms",
         "tools/",
         "tools/debugger/",
         "tools/flags/",
@@ -1489,7 +1490,6 @@
         "tests/ColorSpaceXformTest.cpp",
         "tests/ColorTest.cpp",
         "tests/CopySurfaceTest.cpp",
-        "tests/DFPathRendererTest.cpp",
         "tests/DashPathEffectTest.cpp",
         "tests/DataRefTest.cpp",
         "tests/DefaultPathRendererTest.cpp",