Some cleanups in IconCache class:

1. Make an instance variable final
2. Replace explicit type argument with <>
3. Get rid of an unnecessary return statement

Change-Id: Ifd0017e973c33a40d398fceb65125464f877ff56