am ac1d4eda: Merge "Track tools/base API change in Eclipse plugin" into...
am ac1d4eda: Merge "Track tools/base API change in Eclipse plugin" into studio-1.3-dev automerge: 58a2c552 automerge: 56fe81f3
* commit 'ac1d4eda':
Track tools/base API change in Eclipse plugin