Merge "Remove illegal @Override on interface method." into honeycomb