am 456a4516: am a186456f: Safely handle interrupts during Thread.join()

* commit '456a451668728a18198927fe93f19896929535d3':
  Safely handle interrupts during Thread.join()