Merge "Replace annotation_processors with plugins"
am: bc40469e19

Change-Id: I0f91aa05eca9635ce0bc59e40714adff908af682