TBR=reed@google.com Review URL: https://codereview.chromium.org/1257773002
R=reed@google.com,bungeman@google.com Review URL: https://codereview.chromium.org/1243493003
BUG=skia: Review URL: https://codereview.chromium.org/1135113002