Merge "Fix potential overflow issue in hadamard_16x16()"