Replace custom annotation processor handling am: 8e31c1039e
am: f0fe1779c9

Change-Id: Icbada5f37c11e07a0d872e0274a6603c90509a5c