Some cleanups in IconCache class: 1. Make an instance variable final 2....

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
am: ba9065cf

Change-Id: I631e0e1891dc38aa217eb5c1b589ff9c0cbf3221