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

This commit was generated by merge_from_chromium.py.

Change-Id: I5d12d7823f842d175a942613af190d7740e7dd6d