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

Change-Id: Id94011c35d2f0e335020a395abe922d192c5dd95