Merge "Revert "Make JVMTI DisposeEnvironment and GetEnv thread safe.""
am: e6779fde5a

Change-Id: I2c812c567b093acc77bb2880ce9919876457f708