Merge "Fix xor-int/lit8 tests that used xor-int/lit16 by mistake."