Merge "Track lint API changes"