some catchup CL revisions

BUG=skia:

Review URL: https://codereview.chromium.org/1295593002
4 files changed