Merge "Soong: support Errorprone javacflags" am: fdc2b3bebe
am: 1b1936c487

Change-Id: Ic695e451d51e36ef81bcb0f46845a0361f44cc1d