Merge "Revert "Add LockSupport.park to 004-ThreadStress""