Merge Java 8 changes into Java 6/7 project.