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

Change-Id: Iabd11a98a11a90a2c94635fbb269857e9c3d3a40