Merge "Changes to framework for ToT Skia."