AI 146822: am: CL 146736 am: CL 146674 "Target" nomenclature fixes
  Original author: xav
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 146822
3 files changed