am c9390c8b: am 46b51097: Merge "Safely handle interrupts during Thread.join()"

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