Restore Java 7-specific override annotation.

We require Java 7 to build now and this doesn't affect Java 6 at runtime.
Merge pull request #877 from square/jw/java-seven

Restore Java 7-specific override annotation.