CR7189361: Conditionalize source so that functionality can be easily included or excluded CR7189254: Change makefiles for more flexibility to override defaults See JEP-148 for details of the changes. The webrev is here: http://cr.openjdk.java.net/~jprovino/7189254/webrev.01.