Restore Java 7-specific override annotation.

We require Java 7 to build now and this doesn't affect Java 6 at runtime.