am d5c27f5a: am 8550261a: am 1078942e: Safely handle interrupts during Thread.join()

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