Merge "Put bsd_signal back in android-21+."