Android n mr1 preview 1
Merge "Extra generic type information to aid certain javacs." am: 9a62c01586
am: 0a780cb8b9

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

Change-Id: I088d7743f128e61fae7c0f7291a455b7146cd712