Merge "Update ADT plugin with lint API change" into studio-1.3-dev automerge: d21a036
automerge: d26711d

* commit 'd26711d01b2fc32422cdd7eab9288ae08181ff84':
  Update ADT plugin with lint API change