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

Change-Id: I5e398596f058151acf2805fcff8fe7f52196c529