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

This reverts commit 996cbb566a5521ca3b0653007e7921469f58981a.

Reason for revert: Some new intermittent master-art-host buildbot failures look related and need investigation.

PS2: Fix oat.h merge conflict by not letting the revert touch it.

PS3: Correct PS2 to actually bump the version once more instead.

Change-Id: I70c46dc4494b585768f36e5074d34645d2fb562a
30 files changed