AI 143657: am: CL 143626 am: CL 143453 Bringing the luni tests down to zero failures.
  Original author: jorgp
  Merged from: //branches/cupcake/...
  Original author: android-build
  Merged from: //branches/donutburger/...

Automated import of CL 143657
18 files changed