Actually use Java7ClassValue when using Java 7+.
Merge pull request #1616 from cky/actually-use-Java7ClassValue

Actually use Java7ClassValue when using Java 7+.