Merge "StrictMode: fix deserialization of ViolationInfo on large stacks" am: 29e0b6e789 am: af588a31bc
am: 630f658108

* commit '630f65810860cbd15012a1d5e83a275695e332cd':
  StrictMode: fix deserialization of ViolationInfo on large stacks