Merge "Replace annotation_processors with plugins" am: bc40469e19 am: f30fba0a60
am: 4262bd19ad

Change-Id: I0b417cccddebdccc8613d82d93ff9f0658be8217