Merge "Roll Skia from c42320d53714 to b46961dcb142 (7 revisions)"