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

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