cleanup

BUG=skia:

Review URL: https://codereview.chromium.org/1085583006
18 files changed