Cherry-pick m45 fixes onto m44

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

Review URL: https://codereview.chromium.org/1258083006
8 files changed