Fix annotation processors working w/ generated code on OpenJDK 9 toolchain
am: 55f01c365a

Change-Id: I34d349cb56a64f6928b2ad641315a21718973e56