Merge "Track lint API change" into studio-1.4-dev