am 407771dd: Merge "Track lint API change" into studio-1.4-dev automerge: 131c91c9 automerge: 3f087d44 * commit '407771dd': Track lint API change