Merge "Revert "Track lint API changes""