AI 147242: am: CL 147239 am: CL 147238 Update tools index, replace activitycreator with android
  Original author: ddougherty
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 147242
5 files changed