Merge "convolve_test: fix byte offsets in hbd build"