Merge "Simplify code of convolve3x3"