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

Change-Id: I11a5a570366a073a15ed370b7acdeedef023ac89