Merge "Update highbd convolve functions arguments to use uint16_t src/dst"