Merge "Restore bsd_signal for android-20 and below"
am: 8aefb3d14b

* commit '8aefb3d14be714a61ae74edc72595601ff848d51':
  Restore bsd_signal for android-20 and below