Merge "Soong: support Errorprone javacflags"
am: fdc2b3bebe

Change-Id: I67b78c4620c14eb0b3b2f7d03dc3a7afae4f68e1