Merge Skia @6890

Change-Id: I12ae1c7ebdb566addf3d2783c8405793e842df8a