Fix a couple of api-check complaints.
These aren't real problems, just limitations in tooling. API-check
complains if the formal name of a type param changes. It also complained
that Foo(EventListener) was changed to Foo(T) where "T extends EventListener".
This isn't captured in the API definition but this isn't a binary
incompatible change.
(cherry-picked from bec7706d70c23ec928f43edb9c96eb5572ce2e33)
(cherry picked from commit 3cf0b702ea79423af21b3f06f325869be709bc34)
Change-Id: I5d874e21bf39a4b172b74c01e7df2ef1e5d76dd0
2 files changed
