AI 143684: am: CL 143654 am: CL 143467 Bringing archive down to zero failures and
  zero broken tests.
  Original author: jorgp
  Merged from: //branches/cupcake/...
  Original author: android-build
  Merged from: //branches/donutburger/...

Automated import of CL 143684
3 files changed