Tidy up uses of Integer.valueOf.
am: 7b55ede

* commit '7b55edea45ee5e5447ef8afaa6b144b698ba6f49':
  Tidy up uses of Integer.valueOf.

Change-Id: Id6ea9ba040dad664d9b6db6454694cb7d138af74