am 35757740: Merge "Avoid generating jmp +0."

* commit '35757740da77220dc51d5cff3bc3a779f2eea9ef':
  Avoid generating jmp +0.