Refactoring code to support r8352 of Skia.

Change-Id: Ica1463c84edaf7a46566d1ff792f7f73cef31997
3 files changed