Merge "Changes needed to roll Skia to r7527." into master-chromium