Update apiGenerator to properly handle generics.

Change-Id: I2bedac09ba7d9d399e0397c94d4ab74037fa4fec
12 files changed