Merge third_party/skia from https://chromium.googlesource.com/skia.git at e957df076cb9c82161ad88e20b1be80780d3025e

This commit was generated by merge_from_chromium.py.

Change-Id: I9c6e9d0096fc3fe314600254865c877406606191