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

Change-Id: I9abcd50a260a30d17ff59d50bd2820a71dc225f6