Fix merge of short constants to not give int.
Fix merge of short constants to not give int.

Change-Id: I34a2be26cab72af759ec9fa9f6e7470bb43923eb

treadstoneproject/artinst,treadstoneproject/artinst,treadstoneproject/artinst,treadstoneproject/artinst,treadstoneproject/artinst