Merge SkMatrixConvolutionImageFilter fix to M40

Merging https://codereview.chromium.org/729583002/ to M40 as requested by the bug mentioned below.

BUG=433359
NOTRY=true

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