AI 143673: am: CL 143637 am: CL 143457 Bringing the nio_char tests down to zero failures.
  Original author: jorgp
  Merged from: //branches/cupcake/...
  Original author: android-build
  Merged from: //branches/donutburger/...

Automated import of CL 143673
3 files changed