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

This commit was generated by merge_from_chromium.py.

Change-Id: Ic277175e8a87051333d89a72b2f21ed5aa9b194b