Merge changes Id83aa0d7,I91211641

* changes:
  Revert^2 "Rewrite JVMTI method tracing to use trampolines"
  Allow threads to be marked as unsuspendable by kForUserCode