Merge "Add support for int-to-short in the optimizing compiler."