Revert "Revert^10 "Thread suspension cleanup and deadlock fix""""

This reverts commit 2caa640269faabd2455ec29cfe6ad330d442b715.

Reason for revert: It looks like there may be some new timeout failures on the master-art-host buildbot.

I'll go ahead and generate a revert. Please submit once there are enough failures to investigate.

Change-Id: I272e4ac5f4367a12a2eb027e456d789e8fd26ae6