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

Change-Id: I01a7f9608895542b2f2c7b602a48210e60039c6f