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