Merge "Revert "Make JVMTI DisposeEnvironment and GetEnv thread safe.""