(Java) Add Automake conditionals and CPP #defines for JDK versions
Merge remote branch 'rc/master' into m68k