Merge "Initialize si_code in siginfo." am: 446538b5ad am: ab481277f1
am: 393fcff01a

Change-Id: I9346bcad28f3d6b0eb80598863d64114b4997ff5