Replace custom annotation processor handling am: 8e31c1039e am: f0fe1779c9 am: 76675076d3
am: 28397e0a55

Change-Id: I3464375505ec3d67c46293da498ee61248d11cad