am ab3d49b0: Merge "Use the si_code value bionic passes us."

* commit 'ab3d49b03527d5fc65664f66ddb78c98450c8c84':
  Use the si_code value bionic passes us.