Merge third_party/skia/src from https://chromium.googlesource.com/external/skia/src.git at 214ebc7146494e97143f9bf0d2392655148d8dde

This commit was generated by merge_from_chromium.py.

Change-Id: Id4b91d4793c2a8eaf51423b2b3bcbecbb68e9b12