xdiff: import new 32-bit version of count_masked_bytes()