Remove unnecessary int casting

This is to do the same cleanup as Ifd4543a7d0373e814584bb936a7150bb68478277,
do not use int casting on integer value

Change-Id: I382b151e50fde3aaa2310222fe68da7ec8e3581a
5 files changed