Extra generic type information to aid certain javacs.

In particular this is needed for the code to compile using the error prone
analyzer.

Change-Id: I09904705ced909ead750cb30d0f96c994132a51c
1 file changed