Revert^2 "Correctly handle thread deopt with thread-specific JVMTI events" am: 4060786d8f
am: 161dffa1d8

Change-Id: I8729646e1c772cd957b801e391871c4a6a57c5d7