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

Change-Id: I4527a2c7dfca71f3a2c19539450a414874b190f6