DO NOT MERGE Actually track generics in API definition.

Bug: 24265043
Test: make
Change-Id: Id5544c0f0cf32655f9c00a5cc3eca1cabb70170f
3 files changed