Merge "Decode ptrace-induced SIGTRAP si_code values." am: 293936e41c am: a3cdfc930a
am: 4982d2b1d4

Change-Id: I9eaf255ae033195d5299cfe9672b579a006ed95f