[ocl25] Convert to Java 6
[ocl25] Fix regen for Java 6