Update libpng to 1.6.22rc01

If there are no issues, this version will be released May 26.

Let's start testing with it, so we are ready to update Chrome when
it is available.

BUG=skia:4710
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1983853002

Review-Url: https://codereview.chromium.org/1983853002
diff --git a/DEPS b/DEPS
index 8015846..a8a11e7 100644
--- a/DEPS
+++ b/DEPS
@@ -18,7 +18,8 @@
   "third_party/externals/nanomsg" : "https://skia.googlesource.com/third_party/nanomsg.git@0.4-beta",
   "third_party/externals/zlib"    : "https://chromium.googlesource.com/chromium/src/third_party/zlib@c4e33043fb071b6ea0a153845da625d7ed633d3d",
   # NOTE: If we update libpng, we may need to update the generated file at third_party/libpng/pnglibconf.h
-  "third_party/externals/libpng"  : "https://skia.googlesource.com/third_party/libpng.git@5765a2224946b953ec6702bd01205af475f8c80a",
+  # skbug.com/4710: We'd prefer to mirror AOSP or Chrome.
+  "third_party/externals/libpng"  : "https://github.com/mattsarett/libpng.git@91d2a9e56ea83f7bce091b1606ae4d04ddfc547a",
   "third_party/externals/giflib"  : "https://android.googlesource.com/platform/external/giflib.git@ab10e256df4f684260ca239905b1cec727181f6c",
 
   "third_party/externals/dng_sdk" : "https://android.googlesource.com/platform/external/dng_sdk.git@96443b262250c390b0caefbf3eed8463ba35ecae",
diff --git a/third_party/libpng/README.google b/third_party/libpng/README.google
index c40482c..3ca42b0 100644
--- a/third_party/libpng/README.google
+++ b/third_party/libpng/README.google
@@ -3,11 +3,15 @@
 License: libpng license
 License File: LICENSE, pulled out of png.h
 Description: png compression/decompression library
-Local Modifications: (1) Created pnglibconf.h from pnglibconf.h.prebuilt (a
-    rename with a few additional settings enabled). (2) Copied LICENSE into
-    this directory. (Originally it was pulled from png.h, but libpng has
-    now provided a separate LICENSE file for convenience, which we use
+Local Modifications:
+    (1) Created pnglibconf.h from pnglibconf.h.prebuilt (a
+    rename with a few additional settings enabled).
+    (2) Copied LICENSE into this directory. (Originally it
+    was pulled from png.h, but libpng has now provided a
+    separate LICENSE file for convenience, which we use
     directly.)
+    (3) Included Intel optimizations by running:
+    "patch -i contrib/intel/intel_sse.patch -p1"
 
 FAQ:
 Q: Why does this directory exist?