am 407771dd: Merge "Track lint API change" into studio-1.4-dev automerge: 131c91c automerge: 3f087d4

* commit '407771ddea7bf210ca9d1c6f91ea93efdbd6d6cb':
  Track lint API change