Add @Override for a method that is overriding a new L API

Now all the downstream builds have switched to API Level 21.
Hence putting @Override to new APIs no longer makes javac unhappy.

Change-Id: Ib3324a5d06b17d298beacab8c8802bb14e5be968