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

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