Build changes
Switch back to JDK7.