Merge "Fix ADT tests after IAndroidTarget change." into idea133
 Auto-merge: da06e3d

* commit 'da06e3d51427f7d7bb9a1258fd50d34b5d6cd927':
  Fix ADT tests after IAndroidTarget change.