api lint refactorings and renaming of listener add/remove methods.

Change-Id: Id8eceac2322564da8a5fd3f882574041a0b97704
39 files changed