am 03bfba2d: am 610b21cc: Merge "Add support for int-to-short in the optimizing compiler."

* commit '03bfba2d19cd2484b18ddcffd35a93f10555bb12':
  Add support for int-to-short in the optimizing compiler.