DO NOT MERGE Keep track of method and class type variables.

Also, add consistency checks for parameterized classes and return
types.

Bug: 24265043
Change-Id: Iafe9762f15f6ea439e28cd35bc73277cf1f6e405
5 files changed