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

* commit '13308c50f4f7be454bb9a0cb02435b2af87d890c':
  Restore bsd_signal for android-20 and below