Roll Skia from 2564767d24e5 to 7b1620f36648 (8 revisions)

https://skia.googlesource.com/skia.git/+log/2564767d24e5..7b1620f36648

If this roll has caused a breakage, revert this CL and stop the roller
using the controls here:
https://skia-autoroll.corp.goog/r/android-master-autoroll
Please CC djsollen@google.com on the revert to ensure that a human
is aware of the problem.

To report a problem with the AutoRoller itself, please file a bug:
https://bugs.chromium.org/p/skia/issues/entry?template=Autoroller+Bug

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

Test: Presubmit checks will test this change.
Exempt-From-Owner-Approval: The autoroll bot does not require owner approval.
Change-Id: I6dc1789dac984002d3e59a9ecc603ca671fae16a
diff --git a/Android.bp b/Android.bp
index ff44b93..a86dfbb 100644
--- a/Android.bp
+++ b/Android.bp
@@ -435,6 +435,7 @@
         "src/sksl/SkSLSectionAndParameterHelper.cpp",
         "src/sksl/SkSLString.cpp",
         "src/sksl/SkSLUtil.cpp",
+        "src/sksl/ir/SkSLIRNode.cpp",
         "src/sksl/ir/SkSLSetting.cpp",
         "src/sksl/ir/SkSLSymbolTable.cpp",
         "src/sksl/ir/SkSLType.cpp",
@@ -635,6 +636,7 @@
           "src/gpu/GrTextureProxy.cpp",
           "src/gpu/GrTextureRenderTargetProxy.cpp",
           "src/gpu/GrTextureResolveRenderTask.cpp",
+          "src/gpu/GrThreadSafeUniquelyKeyedProxyViewCache.cpp",
           "src/gpu/GrTransferFromRenderTask.cpp",
           "src/gpu/GrTriangulator.cpp",
           "src/gpu/GrUniformDataManager.cpp",
@@ -1638,6 +1640,7 @@
         "tests/GrTBlockListTest.cpp",
         "tests/GrTestingBackendTextureUploadTest.cpp",
         "tests/GrTextureMipMapInvalidationTest.cpp",
+        "tests/GrThreadSafeViewCacheTest.cpp",
         "tests/GrUploadPixelsTests.cpp",
         "tests/GradientTest.cpp",
         "tests/HSVRoundTripTest.cpp",