AI 146010: am: CL 145858 am: CL 145559 Cleanup for early-look SDK.
  Original author: ddougherty
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 146010
7 files changed