Merge "Build with java7 by default."