Merge "DO NOT MERGE Actually track generics in API definition." into nyc-mr1-dev-plus-aosp