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

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