Replace custom annotation processor handling
am: 8e31c1039e

Change-Id: I96acd31f59346133181a02752f7879142439c7f3