Merge "Update framework to enable Skia to run in debug mode."