am 1c92675c: Merge "Update ADT plugin with lint API change" into studio-1.3-dev automerge: d21a0361 automerge: d26711d0 * commit '1c92675c': Update ADT plugin with lint API change