AI 144836: am: CL 144833 am: CL 144830 Bringing luni down to 15 broken tests. Not perfect,
  but an improvement.
  Original author: jorgp
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 144836
35 files changed