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

This commit was generated by merge_from_chromium.py.

Change-Id: Id1a7ce027b879df8aa08d811ca4aa83a434979b3