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

This commit was generated by merge_from_chromium.py.

Change-Id: I54fd5e528450b4288c3a857d03f5f87cdfdbb63f