Merge changes I34ba5757,Ie65a762a

* changes:
  adb: fix test_sighup.
  adb: fix race condition in test_non_interactive_sigint.