tree 38d152bea8256566444579f96a5309b7a77201db
parent f2b95f63de2ec93ef0cb1c3bbcef88cf0c0368f5
author borenet <borenet@google.com> 1438703818 -0700
committer Commit bot <commit-bot@chromium.org> 1438703818 -0700

Cherry-pick m45 fixes onto m44

BUG=skia:4132
NOTREECHECKS=true
NOTRY=true
NOPRESUBMIT=true

Review URL: https://codereview.chromium.org/1258083006