Don't use @Override on interface implementations

Restores Java 5 compatibility.
Merge bug26048