Merge "X86: Use short forward jumps if possible"