Revert "Thread suspension cleanup and deadlock fix"

This reverts commit 7c39c86b17c91e651de1fcc0876fe5565e3f5204.

Reason for revert: We're see a number of new, somewhat rare, timeouts on multiple tests.

Change-Id: Ida9a4f80b64b6fedc16db176a8df9c2e985ef482
16 files changed