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

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