Merge "Make JVMTI DisposeEnvironment and GetEnv thread safe."
am: 8cceb1faf8

Change-Id: I931d0e9bf03fb8345eed52b250c24b90844ab832