AI 143385: am: CL 143235 am: CL 143073 Bringing the Crypto tests down to zero failures.
  Original author: jorgp
  Merged from: //branches/cupcake/...
  Original author: android-build
  Merged from: //branches/donutburger/...

Automated import of CL 143385
5 files changed