am 18ae1786: am ffa33efc: Merge change I75630000 into eclair

Merge commit '18ae1786b572d7385cbddd7da3167e190b952ded'

* commit '18ae1786b572d7385cbddd7da3167e190b952ded':
  Fixing tests that exercise SecurityManager plus stack inspection.