Merge "Refactoring code to support r8352 of Skia."