[automerger skipped] Revert^2 "Correctly handle thread deopt with thread-specific JVMTI events"
am: 76da18e3ea -s ours
am skip reason: change_id Id496b272f353a5a5e000574c107a97d67405d54b with SHA1 4060786d8f is in history

Change-Id: I3b10b2c2b6f93f0654f2bed03e8decbd9f4a4fbe