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

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