1) The values were not properly exclusive.
   E.g. when compiling under OpenJDK 1.6, iscjava12 was set (!)

2) On Java 1.6, should not enable the parts that are (only) for Java7!

3) When non-JAVA7, need to preprocess the files that have JAVA7-only code, so that it gets removed

Change-Id: I99b6bd9e781fee1007a04a4dc3d3f952c1b2eb00