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

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