Merge "Fix conditional jump over jmp (X86/X86-64/ARM32)"
am: 3f96f42b37

* commit '3f96f42b3788f9b9b243822212ec686e599279ef':
  Fix conditional jump over jmp (X86/X86-64/ARM32)