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

This commit was generated by merge_from_chromium.py.

Change-Id: I4a58fb07712cadee523eb1e92fe2a79ac2b5b80b