Merge "Update framework to support r5967 of Skia." into master-chromium