Merge "Track tools/base API change in Eclipse plugin" into studio-1.3-dev
automerge: 58a2c55

* commit '58a2c552e4b18257f993cfd52627003dfb0b2bda':
  Track tools/base API change in Eclipse plugin