Merge "Add missing @Override annotations in support library code."