Extra generic type information to aid certain javacs.

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

Change-Id: I07b1e94da05a26d214d4c274483d0b0d036a30bc
1 file changed