Merge "Restore bsd_signal for android-20 and below"