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

* commit '52ff7c18102c06b60a2f80de5f92be072f4ec936':
  Track tools/base API change in Eclipse plugin