am 870db7fb: am 1c92675c: Merge "Update ADT plugin with lint API change" into studio-1.3-dev automerge: d21a036 automerge: d26711d

* commit '870db7fbed553540aacd4e23a4383dd5990045ff':
  Update ADT plugin with lint API change