Android n mr1 preview 2
Merge "Extra generic type information to aid certain javacs." am: b88e8ddc52
am: d4399625aa

* commit 'd4399625aaa4c41d460f80df334b322b170bbfb3':
  Extra generic type information to aid certain javacs.

Change-Id: Id609e78cc6429dcffeb5f44ca201ed6181e5009b