Roll external/skia b3d0f7c79..9ac995354 (10 commits)

https://skia.googlesource.com/skia.git/+log/b3d0f7c79..9ac995354

2017-05-17 bsalomon@google.com Remove GrSurface::desc() method.
2017-05-17 brianosman@google.com Add GM to verify that drawX == (path.addX, drawPath)
2017-05-17 recipe-roller@chromium.org Roll recipe dependencies (trivial).
2017-05-17 egdaniel@google.com Revert "Add GM to verify that drawX == (path.addX, drawPath)"
2017-05-17 bsalomon@google.com Replace most uses of GrSurface::desc() with conifg(), width(), etc.
2017-05-17 recipe-roller@chromium.org Roll recipe dependencies (trivial).
2017-05-17 recipe-roller@chromium.org Roll recipe dependencies (trivial).
2017-05-17 bsalomon@google.com Remove GrSurfaceDesc member from GrSurfaceProxy.
2017-05-17 msarett@google.com Add tool to create test images with interesting color profiles
2017-05-17 brianosman@google.com Add GM to verify that drawX == (path.addX, drawPath)

Test: Presubmit checks will test this change.
Change-Id: I8ba37bab2c895f398097bef78a1645988dfc25ab
diff --git a/Android.bp b/Android.bp
index 5527c9d..45df4ea 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1170,6 +1170,7 @@
         "gm/shadowutils.cpp",
         "gm/shallowgradient.cpp",
         "gm/shapes.cpp",
+        "gm/shapes_as_paths.cpp",
         "gm/showmiplevels.cpp",
         "gm/simple_magnification.cpp",
         "gm/simpleaaclip.cpp",
@@ -2050,6 +2051,7 @@
         "gm/shadowutils.cpp",
         "gm/shallowgradient.cpp",
         "gm/shapes.cpp",
+        "gm/shapes_as_paths.cpp",
         "gm/showmiplevels.cpp",
         "gm/simple_magnification.cpp",
         "gm/simpleaaclip.cpp",