Android n mr1 preview 2
Merge changes from topic 'aosp-generics-api'

* changes:
  DO NOT MERGE Keep track of method and class type variables.
  DO NOT MERGE API check: Detect when result type's dimension changes