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