Merge "Update ADT & SDK Tools to 24.0.2" into studio-1.0-dev
automerge: e99a450

* commit 'e99a450c2d1a25f890e2d991b365f9fae2ad48d7':
  Update ADT & SDK Tools to 24.0.2