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

Change-Id: I12b8c6e19f3ee28920c7f164aa5c83bdfa89bb76