Merge "Unpin staledataclass-annotation-processor from Java 8"