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: Ibfcef50dec0291f51a4372e18da40e859ac3e2e1
2 files changed