Merge "Put bsd_signal back in android-21+." am: 4008acc1a9 am: c7ddeb9e73
am: 58894d9fec

Change-Id: Ie64aacb5a65d93d1b0b7390ba125b6eb74401b54