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

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