Merge "Track lint API changes" into idea133