Merge "Add superclass support to Lint"