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

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