Merge "Roll Skia from b2d197d7c22a to 559a2890e285 (6 revisions)"