AI 143677: am: CL 143642 am: CL 143458 Bringing the security tests down to zero failures (and
  adding lots of missing headers in the process).
  Original author: jorgp
  Merged from: //branches/cupcake/...
  Original author: android-build
  Merged from: //branches/donutburger/...

Automated import of CL 143677
59 files changed