am 20d9be71: am ac1d4eda: Merge "Track tools/base API change in Eclipse plugin" into studio-1.3-dev automerge: 58a2c55 automerge: 56fe81f

* commit '20d9be71b4b7305f643442942a6faa5df25bfc11':
  Track tools/base API change in Eclipse plugin