6512707: "incompatible types" after (unrelated) annotation processing

Reviewed-by: darcy
4 files changed